summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/cursor.hxx2
-rw-r--r--starmath/inc/dialog.hxx2
-rw-r--r--starmath/inc/document.hxx6
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/inc/node.hxx6
-rw-r--r--starmath/inc/smmod.hxx12
-rw-r--r--starmath/inc/symbol.hxx8
-rw-r--r--starmath/inc/utility.hxx4
-rw-r--r--starmath/inc/view.hxx8
-rw-r--r--starmath/inc/visitors.hxx2
10 files changed, 26 insertions, 26 deletions
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 441a733bb21f..188c09843249 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -460,7 +460,7 @@ private:
SmNode* Product();
SmNode* Factor();
SmNode* Postfix();
- SmNode* Error();
+ static SmNode* Error();
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index e208cf6dce55..c67190b250b5 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -226,7 +226,7 @@ class SmDistanceDialog : public ModalDialog
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
- void SetHelpId(MetricField &rField, const OString& sHelpId);
+ static void SetHelpId(MetricField &rField, const OString& sHelpId);
void SetCategory(sal_uInt16 Category);
public:
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index faa52b878313..3a052c16841c 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -165,8 +165,8 @@ public:
SmDocShell( SfxModelFlags i_nSfxCreationFlags );
virtual ~SmDocShell();
- void LoadSymbols();
- void SaveSymbols();
+ static void LoadSymbols();
+ static void SaveSymbols();
void ArrangeFormula();
@@ -207,7 +207,7 @@ public:
virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE;
- SfxItemPool& GetPool() const;
+ static SfxItemPool& GetPool();
void Execute( SfxRequest& rReq );
void GetState(SfxItemSet &);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b3864744e333..35557fb491b1 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -122,7 +122,7 @@ public:
void MarkError(const Point &rPos);
void SelNextMark();
void SelPrevMark();
- bool HasMark(const OUString &rText) const;
+ static bool HasMark(const OUString &rText);
void Flush();
void DeleteEditView( SmViewShell &rView );
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 27b539a08ae8..540de952c9bf 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -819,9 +819,9 @@ public:
class SmRootNode : public SmStructureNode
{
protected:
- void GetHeightVerOffset(const SmRect &rRect,
- long &rHeight, long &rVerOffset) const;
- Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra) const;
+ static void GetHeightVerOffset(const SmRect &rRect,
+ long &rHeight, long &rVerOffset);
+ static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra);
public:
SmRootNode(const SmToken &rNodeToken)
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 4b1c61c4e72c..59020d815280 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -76,13 +76,13 @@ public:
const ResStringArray& GetUiSymbolNamesArray() const { return aUiSymbolNamesAry; }
const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
- const OUString GetUiSymbolName( const OUString &rExportName ) const;
- const OUString GetExportSymbolName( const OUString &rUiName ) const;
+ static const OUString GetUiSymbolName( const OUString &rExportName );
+ static const OUString GetExportSymbolName( const OUString &rUiName );
const ResStringArray& GetUiSymbolSetNamesArray() const { return aUiSymbolSetNamesAry; }
const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
- const OUString GetUiSymbolSetName( const OUString &rExportName ) const;
- const OUString GetExportSymbolSetName( const OUString &rUiName ) const;
+ static const OUString GetUiSymbolSetName( const OUString &rExportName );
+ static const OUString GetExportSymbolSetName( const OUString &rUiName );
};
class SmModule : public SfxModule, utl::ConfigurationListener
@@ -93,7 +93,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener
std::unique_ptr<SvtSysLocale> mpSysLocale;
VclPtr<VirtualDevice> mpVirtualDev;
- void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
+ static void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
public:
TYPEINFO_OVERRIDE();
@@ -116,7 +116,7 @@ public:
SmLocalizedSymbolData & GetLocSymbolData();
- void GetState(SfxItemSet&);
+ static void GetState(SfxItemSet&);
const SvtSysLocale& GetSysLocale();
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 51515406cec8..c05ea47f1f16 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -41,24 +41,24 @@
inline const OUString GetExportSymbolName( const OUString &rUiSymbolName )
{
- return SM_MOD()->GetLocSymbolData().GetExportSymbolName( rUiSymbolName );
+ return SmLocalizedSymbolData::GetExportSymbolName( rUiSymbolName );
}
inline const OUString GetUiSymbolName( const OUString &rExportSymbolName )
{
- return SM_MOD()->GetLocSymbolData().GetUiSymbolName( rExportSymbolName );
+ return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName );
}
inline const OUString GetExportSymbolSetName( const OUString &rUiSymbolSetName )
{
- return SM_MOD()->GetLocSymbolData().GetExportSymbolSetName( rUiSymbolSetName );
+ return SmLocalizedSymbolData::GetExportSymbolSetName( rUiSymbolSetName );
}
inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName )
{
- return SM_MOD()->GetLocSymbolData().GetUiSymbolSetName( rExportSymbolSetName );
+ return SmLocalizedSymbolData::GetUiSymbolSetName( rExportSymbolSetName );
}
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ccd83f72274c..0870e6e686aa 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -128,8 +128,8 @@ protected:
sal_uInt16 nMaxItems;
std::deque<vcl::Font> aFontVec;
- bool CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const;
- OUString GetStringItem(const vcl::Font &rItem);
+ static bool CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont);
+ static OUString GetStringItem(const vcl::Font &rItem);
public:
SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ddb59154f51d..1256044ac3b1 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -249,15 +249,15 @@ class SmViewShell: public SfxViewShell
bool bInsertIntoEditWindow;
protected:
- Size GetTextLineSize(OutputDevice& rDevice,
+ static Size GetTextLineSize(OutputDevice& rDevice,
const OUString& rLine);
- Size GetTextSize(OutputDevice& rDevice,
+ static Size GetTextSize(OutputDevice& rDevice,
const OUString& rText,
long MaxWidth);
- void DrawTextLine(OutputDevice& rDevice,
+ static void DrawTextLine(OutputDevice& rDevice,
const Point& rPosition,
const OUString& rLine);
- void DrawText(OutputDevice& rDevice,
+ static void DrawText(OutputDevice& rDevice,
const Point& rPosition,
const OUString& rText,
sal_uInt16 MaxWidth);
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index bf5bb2edcdaa..25b4d17e9dc0 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -378,7 +378,7 @@ private:
/** Clone children of pSource and give them to pTarget */
void CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget );
/** Clone attributes on a pNode */
- void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
+ static void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
};