summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/drawinglayer/primitive2d/textlayoutdevice.hxx2
-rw-r--r--include/formula/tokenarray.hxx2
-rw-r--r--include/svl/IndexedStyleSheets.hxx1
-rw-r--r--include/svl/numformat.hxx46
-rw-r--r--include/svl/style.hxx1
-rw-r--r--include/svl/zformat.hxx12
-rw-r--r--include/svtools/editbrowsebox.hxx2
-rw-r--r--include/svx/svdobj.hxx8
-rw-r--r--include/svx/svdovirt.hxx4
-rw-r--r--include/vcl/idletask.hxx6
-rw-r--r--include/vcl/outdev.hxx7
-rw-r--r--include/vcl/task.hxx5
-rw-r--r--include/vcl/vcllayout.hxx5
-rw-r--r--include/vcl/weld.hxx4
14 files changed, 62 insertions, 43 deletions
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 6f98b50a4f..db019494a8 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -63,6 +63,8 @@ class DRAWINGLAYER_DLLPUBLIC TextLayouterDevice
/// internally used VirtualDevice
SolarMutexGuard maSolarGuard;
VirtualDevice& mrDevice;
+ double mnFontScalingFixX = 1.0;
+ double mnFontScalingFixY = 1.0;
public:
/// constructor/destructor
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 330543d427..fbf2c18676 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -577,7 +577,7 @@ public:
void ReInit( const FormulaTokenArray& );
private:
- const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
+ SAL_DLLPRIVATE const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
};
// For use in SAL_INFO, SAL_WARN etc
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index 910acd9e25..c58a4b7367 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -144,6 +144,7 @@ public:
void Clear(StyleSheetDisposer& cleanup);
void Reindex();
+ void ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName);
/** Warning: counting for n starts at 0, i.e., the 0th style sheet is the first that is found. */
SfxStyleSheetBase* GetNthStyleSheetThatMatchesPredicate(sal_Int32 n,
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index 0a374f3c33..2ebed94959 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -53,7 +53,7 @@ public:
*/
static const sal_uInt16 INPUTSTRING_PRECISION;
- /// Preferred ctor with service manager and language/country enum
+ /// ctor with service manager and language/country enum
SvNumberFormatter(const css::uno::Reference<css::uno::XComponentContext>& rxContext,
LanguageType eLang);
@@ -62,7 +62,7 @@ public:
/// Set CallBack to ColorTable
void SetColorLink(const Link<sal_uInt16, Color*>& rColorTableCallBack);
/// Do the CallBack to ColorTable
- Color* GetUserDefColor(sal_uInt16 nIndex);
+ Color* GetUserDefColor(sal_uInt16 nIndex) const;
/// Change language/country, also input and format scanner
void ChangeIntl(LanguageType eLnge);
@@ -297,9 +297,6 @@ public:
sal_uInt32 GetStandardFormat(double fNumber, sal_uInt32 nFIndex, SvNumFormatType eType,
LanguageType eLnge);
- /// Whether nFIndex is a special builtin format
- bool IsSpecialStandardFormat(sal_uInt32 nFIndex, LanguageType eLnge);
-
/** Return a time format that best matches fNumber. */
sal_uInt32 GetTimeFormat(double fNumber, LanguageType eLnge, bool bForceDuration);
@@ -359,7 +356,7 @@ public:
NF_INDEX_TABLE_ENTRIES if it's not a builtin format.
@see NfIndexTableOffset
*/
- NfIndexTableOffset GetIndexTableOffset(sal_uInt32 nFormat) const;
+ static NfIndexTableOffset GetIndexTableOffset(sal_uInt32 nFormat);
/** Set evaluation type and order of input date strings
@see NfEvalDateFormat
@@ -573,6 +570,8 @@ public:
private:
mutable ::osl::Mutex m_aMutex;
css::uno::Reference<css::uno::XComponentContext> m_xContext;
+ const LanguageType IniLnge; // Initialized setting language/country
+ LanguageType ActLnge; // Current setting language/country
LanguageTag maLanguageTag;
std::map<sal_uInt32, std::unique_ptr<SvNumberformat>>
aFTable; // Table of format keys to format entries
@@ -591,8 +590,6 @@ private:
Link<sal_uInt16, Color*> aColorLink; // User defined color table CallBack
sal_uInt32 MaxCLOffset; // Max language/country offset used
sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale
- LanguageType IniLnge; // Initialized setting language/country
- LanguageType ActLnge; // Current setting language/country
NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation
bool bNoZero; // Zero value suppression
@@ -609,9 +606,6 @@ private:
// get the registry, create one if none exists
SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry();
- // called by ctors
- SVL_DLLPRIVATE void ImpConstruct(LanguageType eLang);
-
// Generate builtin formats provided by i18n behind CLOffset,
// if bNoAdditionalFormats==false also generate additional i18n formats.
SVL_DLLPRIVATE void ImpGenerateFormats(sal_uInt32 CLOffset, bool bNoAdditionalFormats);
@@ -633,7 +627,7 @@ private:
// Test whether format code already exists, then return index key,
// otherwise NUMBERFORMAT_ENTRY_NOT_FOUND
SVL_DLLPRIVATE sal_uInt32 ImpIsEntry(std::u16string_view rString, sal_uInt32 CLOffset,
- LanguageType eLnge);
+ LanguageType eLnge) const;
// Create builtin formats for language/country if necessary, return CLOffset
SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL(LanguageType eLnge);
@@ -679,31 +673,31 @@ private:
// link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method>
DECL_DLLPRIVATE_STATIC_LINK(SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void);
- // return position of a special character
- sal_Int32 ImpPosToken(const OUStringBuffer& sFormat, sal_Unicode token,
- sal_Int32 nStartPos = 0) const;
-
// Substitute a format during GetFormatEntry(), i.e. system formats.
- SvNumberformat* ImpSubstituteEntry(SvNumberformat* pFormat, sal_uInt32* o_pRealKey = nullptr);
+ SVL_DLLPRIVATE SvNumberformat* ImpSubstituteEntry(SvNumberformat* pFormat,
+ sal_uInt32* o_pRealKey = nullptr);
+
+ // Whether nFIndex is a special builtin format
+ SVL_DLLPRIVATE bool ImpIsSpecialStandardFormat(sal_uInt32 nFIndex, LanguageType eLnge);
+
+ // called by SvNumberFormatterRegistry_Impl::Notify if the default system currency changes
+ SVL_DLLPRIVATE void ResetDefaultSystemCurrency();
+
+ // Replace the SYSTEM language/country format codes. Called upon change of
+ // the user configurable locale.
+ // Old compatibility codes are replaced, user defined are converted, and
+ // new format codes are appended.
+ SVL_DLLPRIVATE void ReplaceSystemCL(LanguageType eOldLanguage);
// own mutex, may also be used by internal class SvNumberFormatterRegistry_Impl
static ::osl::Mutex& GetGlobalMutex();
::osl::Mutex& GetInstanceMutex() const { return m_aMutex; }
public:
- // called by SvNumberFormatterRegistry_Impl::Notify if the default system currency changes
- void ResetDefaultSystemCurrency();
-
// Called by SvNumberFormatterRegistry_Impl::Notify if the system locale's
// date acceptance patterns change.
void InvalidateDateAcceptancePatterns();
- // Replace the SYSTEM language/country format codes. Called upon change of
- // the user configurable locale.
- // Old compatibility codes are replaced, user defined are converted, and
- // new format codes are appended.
- void ReplaceSystemCL(LanguageType eOldLanguage);
-
const css::uno::Reference<css::uno::XComponentContext>& GetComponentContext() const;
//! The following method is not to be used from outside but must be
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index fc12dc0be7..87c5563ed5 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -275,6 +275,7 @@ public:
virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, SfxStyleSearchBits n=SfxStyleSearchBits::All );
void Reindex();
+ void ReindexOnNameChange(const OUString& rOldName, const OUString& rNewName);
/** Add a style sheet.
* Not an actual public function. Do not call it from non-subclasses.
*/
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 1fa52c3384..b4d7ddb0ac 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -638,7 +638,7 @@ private:
sal_uInt16 j,
sal_uInt16 nIx,
sal_Int32 nDigCnt,
- bool bAddDecSep = true );
+ bool bAddDecSep = true ) const;
// Helper function to fill in the group (AKA thousand) separators
// or to skip additional digits
@@ -647,14 +647,14 @@ private:
sal_Int32& k,
sal_uInt16 nIx,
sal_Int32 & nDigitCount,
- utl::DigitGroupingIterator & );
+ utl::DigitGroupingIterator & ) const;
SVL_DLLPRIVATE bool ImpDecimalFill( OUStringBuffer& sStr,
double& rNumber,
sal_Int32 nDecPos,
sal_uInt16 j,
sal_uInt16 nIx,
- bool bInteger );
+ bool bInteger ) const;
/** Calculate each element of fraction:
* integer part, numerator part, denominator part
@@ -701,11 +701,11 @@ private:
SVL_DLLPRIVATE bool ImpGetLogicalOutput( double fNumber,
sal_uInt16 nIx,
- OUStringBuffer& OutString );
+ OUStringBuffer& OutString ) const;
SVL_DLLPRIVATE bool ImpGetNumberOutput( double fNumber,
sal_uInt16 nIx,
- OUStringBuffer& OutString );
+ OUStringBuffer& OutString ) const;
SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat );
@@ -731,7 +731,7 @@ private:
// nFractionDecimals, unless nMinimumInputLineDecimals>0 is given for input
// line string where extra trailing "0" are discarded.
SVL_DLLPRIVATE sal_uInt16 ImpGetFractionOfSecondString( OUStringBuffer& rBuf, double fFractionOfSecond,
- int nFractionDecimals, bool bAddOneRoundingDecimal, sal_uInt16 nIx, sal_uInt16 nMinimumInputLineDecimals );
+ int nFractionDecimals, bool bAddOneRoundingDecimal, sal_uInt16 nIx, sal_uInt16 nMinimumInputLineDecimals ) const;
// transliterate according to NativeNumber
SVL_DLLPRIVATE OUString impTransliterateImpl(const OUString& rStr, const SvNumberNatNum& rNum) const;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index c89a396a9d..6a581d4e73 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -829,6 +829,8 @@ namespace svt
void SetDate(const Date& rDate);
+ virtual void SetEditableReadOnly(bool bReadOnly) override;
+
virtual void dispose() override;
private:
std::unique_ptr<weld::MenuButton> m_xMenuButton;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 892beb5666..396c09e8cd 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -752,10 +752,10 @@ public:
bool IsMoveProtect() const { return m_bMovProt;}
void SetResizeProtect(bool bProt);
bool IsResizeProtect() const { return m_bSizProt;}
- void SetPrintable(bool bPrn);
- bool IsPrintable() const { return !m_bNoPrint;}
- void SetVisible(bool bVisible);
- bool IsVisible() const { return mbVisible;}
+ virtual void SetPrintable(bool isPrintable);
+ virtual bool IsPrintable() const;
+ virtual void SetVisible(bool isVisible);
+ virtual bool IsVisible() const;
void SetMarkProtect(bool bProt);
bool IsMarkProtect() const { return m_bMarkProt;}
virtual bool IsSdrTextObj() const { return false; }
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 17c8693130..ca5f6858ec 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -61,6 +61,10 @@ public:
const SdrObject& GetReferencedObj() const;
virtual void NbcSetAnchorPos(const Point& rAnchorPos) override;
+ virtual void SetPrintable(bool isPrintable) override;
+ virtual bool IsPrintable() const override;
+ virtual void SetVisible(bool isVisible) override;
+ virtual bool IsVisible() const override;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
virtual SdrInventor GetObjInventor() const override;
virtual SdrObjKind GetObjIdentifier() const override;
diff --git a/include/vcl/idletask.hxx b/include/vcl/idletask.hxx
index fd5b17c61b..1b8e33b7b1 100644
--- a/include/vcl/idletask.hxx
+++ b/include/vcl/idletask.hxx
@@ -20,9 +20,9 @@ public:
bool GetFlag() const;
IdleTask();
- // Launch an Idle at TaskPriority::LOWEST and wait until it completes. Can
- // be used to wait until pending Idles at higher TaskPriority::DEFAULT_IDLE
- // have completed.
+ // Launch an Idle at reserved lowest priority of TaskPriority::TOOLKIT_DEBUG
+ // and wait until it completes. Can be used to wait until pending Idles at
+ // higher TaskPriority have completed.
static void waitUntilIdleDispatched();
private:
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 3293645591..ea49f50506 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -52,6 +52,7 @@
#include <vcl/settings.hxx>
#include <vcl/vclreferencebase.hxx>
+#include <basegfx/range/b2drectangle.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2enums.hxx>
@@ -961,6 +962,11 @@ public:
sal_uLong nLayoutWidth = 0, KernArraySpan aDXArray = KernArraySpan(),
std::span<const sal_Bool> pKashidaArray = {},
const SalLayoutGlyphs* pGlyphs = nullptr ) const;
+ bool GetTextBoundRect( basegfx::B2DRectangle& rRect,
+ const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1,
+ sal_uLong nLayoutWidth = 0, KernArraySpan aDXArray = KernArraySpan(),
+ std::span<const sal_Bool> pKashidaArray = {},
+ const SalLayoutGlyphs* pGlyphs = nullptr ) const;
tools::Rectangle ImplGetTextBoundRect( const SalLayout& ) const;
@@ -1614,6 +1620,7 @@ public:
SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly) const;
SAL_WARN_UNUSED_RESULT tools::PolyPolygon PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const;
SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const;
+ SAL_WARN_UNUSED_RESULT basegfx::B2DRectangle PixelToLogic(const basegfx::B2DRectangle& rDeviceRect) const;
SAL_WARN_UNUSED_RESULT vcl::Region PixelToLogic(const vcl::Region& rDeviceRegion) const;
SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt, const MapMode& rMapMode) const;
SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize, const MapMode& rMapMode) const;
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 5ed8cde7ff..41c73bf396 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -34,10 +34,11 @@ enum class TaskPriority
REPAINT, ///< All repaint events should go in here
POST_PAINT, ///< Everything running directly after painting
DEFAULT_IDLE, ///< Default idle priority
- LOWEST ///< Low, very idle cleanup tasks
+ LOWEST, ///< Low, very idle cleanup tasks
+ TOOLKIT_DEBUG ///< Do not use. Solely for IdleTask::waitUntilIdleDispatched
};
-#define PRIO_COUNT (static_cast<int>(TaskPriority::LOWEST) + 1)
+#define PRIO_COUNT (static_cast<int>(TaskPriority::TOOLKIT_DEBUG) + 1)
class VCL_DLLPUBLIC Task
{
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 7c7a179b9b..c946f6f678 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -21,6 +21,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2drectangle.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/gen.hxx>
#include <tools/degree.hxx>
@@ -103,7 +104,9 @@ public:
virtual bool GetNextGlyph(const GlyphItem** pGlyph, basegfx::B2DPoint& rPos, int& nStart,
const LogicalFontInstance** ppGlyphFont = nullptr) const = 0;
virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const;
- bool GetBoundRect(tools::Rectangle&) const;
+ bool GetBoundRect(basegfx::B2DRectangle&) const;
+
+ static tools::Rectangle BoundRect2Rectangle(basegfx::B2DRectangle&);
virtual SalLayoutGlyphs GetGlyphs() const;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fc585bdb10..2a4e1ef084 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -889,6 +889,10 @@ public:
virtual void set_max_mru_count(int nCount) = 0;
virtual OUString get_mru_entries() const = 0;
virtual void set_mru_entries(const OUString& rEntries) = 0;
+
+ // Backwards compatibility, should be avoided to allow
+ // UI consistency.
+ virtual void set_max_drop_down_rows(int nRows) = 0;
};
enum class ColumnToggleType
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 16:45:43 +0000