diff options
author | David Tardon <dtardon@redhat.com> | 2015-04-16 10:01:37 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-04-16 10:02:17 +0200 |
commit | 565716b0abca281dfc1291aedf4497f55611b6b1 (patch) | |
tree | 7aa0296c20fcc596216f47415621bfa257d08971 /sc | |
parent | cfaccff5aa7be7e240e51c6661ee09812b1aa113 (diff) |
Revert "make more classes dllpublic"
This reverts commit add2ca7b3ab10ed9d18e60d8e50020168d922836.
It causes too much breakage on windows. It is better to start again from
scratch.
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/chgtrack.hxx | 10 | ||||
-rw-r--r-- | sc/inc/dapiuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dbdata.hxx | 16 | ||||
-rw-r--r-- | sc/inc/queryparam.hxx | 14 | ||||
-rw-r--r-- | sc/inc/scmod.hxx | 34 | ||||
-rw-r--r-- | sc/inc/stlpool.hxx | 2 | ||||
-rw-r--r-- | sc/inc/stlsheet.hxx | 2 | ||||
-rw-r--r-- | sc/inc/userdat.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatdlg.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/dbfunc.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/transobj.hxx | 2 |
15 files changed, 48 insertions, 48 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 84ecc708aa34..6599d841b95a 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -214,7 +214,7 @@ class ScChangeActionIns; class ScChangeActionDel; class ScChangeActionContent; -class SC_DLLPUBLIC ScChangeAction +class ScChangeAction { friend class ScChangeTrack; friend class ScChangeActionIns; @@ -415,7 +415,7 @@ public: }; // ScChangeActionIns -class SC_DLLPUBLIC ScChangeActionIns : public ScChangeAction +class ScChangeActionIns : public ScChangeAction { friend class ScChangeTrack; @@ -560,7 +560,7 @@ public: }; // ScChangeActionMove -class SC_DLLPUBLIC ScChangeActionMove : public ScChangeAction +class ScChangeActionMove : public ScChangeAction { friend class ScChangeTrack; friend class ScChangeActionDel; @@ -661,7 +661,7 @@ enum ScChangeActionContentCellType SC_CACCT_MATREF }; -class SC_DLLPUBLIC ScChangeActionContent : public ScChangeAction +class ScChangeActionContent : public ScChangeAction { friend class ScChangeTrack; @@ -893,7 +893,7 @@ enum ScChangeTrackMergeState // and are decremented, to keep values in a table separated from "normal" actions. #define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfffffff0) -class SC_DLLPUBLIC ScChangeTrack : public utl::ConfigurationListener +class ScChangeTrack : public utl::ConfigurationListener { friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW ); friend bool ScChangeActionDel::Reject( ScDocument* pDoc ); diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 6a8e4d528ed6..3052b3760a65 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -150,7 +150,7 @@ public: }; // ScDataPilotDescriptorBase is never instantiated directly -class SC_DLLPUBLIC ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor, +class ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor, public com::sun::star::beans::XPropertySet, public com::sun::star::sheet::XDataPilotDataLayoutFieldSupplier, public com::sun::star::lang::XServiceInfo, diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index b23927591976..708bd858c628 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -35,7 +35,7 @@ struct ScQueryParam; struct ScSubTotalParam; struct ScImportParam; -class SC_DLLPUBLIC ScDBData : public ScRefreshTimer +class ScDBData : public ScRefreshTimer { private: boost::scoped_ptr<ScSortParam> mpSortParam; @@ -76,7 +76,7 @@ public: bool operator() (const ScDBData& left, const ScDBData& right) const; }; - ScDBData(const OUString& rName, + SC_DLLPUBLIC ScDBData(const OUString& rName, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bByR = true, bool bHasH = true); @@ -91,7 +91,7 @@ public: const OUString& GetName() const { return aName; } const OUString& GetUpperName() const { return aUpper; } void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; - void GetArea(ScRange& rRange) const; + SC_DLLPUBLIC void GetArea(ScRange& rRange) const; void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); bool IsByRow() const { return bByRow; } @@ -115,10 +115,10 @@ public: void GetSortParam(ScSortParam& rSortParam) const; void SetSortParam(const ScSortParam& rSortParam); - void GetQueryParam(ScQueryParam& rQueryParam) const; - void SetQueryParam(const ScQueryParam& rQueryParam); - bool GetAdvancedQuerySource(ScRange& rSource) const; - void SetAdvancedQuerySource(const ScRange* pSource); + SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; + SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); + SC_DLLPUBLIC bool GetAdvancedQuerySource(ScRange& rSource) const; + SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); @@ -130,7 +130,7 @@ public: bool IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; bool HasImportParam() const; - bool HasQueryParam() const; + SC_DLLPUBLIC bool HasQueryParam() const; bool HasSortParam() const; bool HasSubTotalParam() const; diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 7e610cd47756..867b15d880f8 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -36,7 +36,7 @@ class SharedStringPool; } -struct SC_DLLPUBLIC ScQueryParamBase +struct ScQueryParamBase { bool bHasHeader; bool bByRow; @@ -50,12 +50,12 @@ struct SC_DLLPUBLIC ScQueryParamBase virtual bool IsValidFieldIndex() const; - SCSIZE GetEntryCount() const; - const ScQueryEntry& GetEntry(SCSIZE n) const; - ScQueryEntry& GetEntry(SCSIZE n); - ScQueryEntry& AppendEntry(); + SC_DLLPUBLIC SCSIZE GetEntryCount() const; + SC_DLLPUBLIC const ScQueryEntry& GetEntry(SCSIZE n) const; + SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n); + SC_DLLPUBLIC ScQueryEntry& AppendEntry(); ScQueryEntry* FindEntryByField(SCCOLROW nField, bool bNew); - void RemoveEntryByField(SCCOLROW nField); + SC_DLLPUBLIC void RemoveEntryByField(SCCOLROW nField); void Resize(size_t nNew); void FillInExcelSyntax( svl::SharedStringPool& rPool, const OUString& aCellStr, SCSIZE nIndex, SvNumberFormatter* pFormatter ); @@ -76,7 +76,7 @@ protected: EntriesType maEntries; }; -struct SC_DLLPUBLIC ScQueryParamTable +struct ScQueryParamTable { SCCOL nCol1; SCROW nRow1; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 4059eb70582d..2673e2f1ad7d 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -80,7 +80,7 @@ class ScAnyRefModalDlg; #define SC_DROP_NAVIGATOR 1 #define SC_DROP_TABLE 2 -class SC_DLLPUBLIC ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener +class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener { Timer aIdleTimer; Idle aSpellIdle; @@ -171,18 +171,18 @@ public: // Options: const ScViewOptions& GetViewOptions (); - const ScDocOptions& GetDocOptions (); - const ScAppOptions& GetAppOptions (); - const ScDefaultsOptions& GetDefaultsOptions (); - const ScFormulaOptions& GetFormulaOptions (); - const ScInputOptions& GetInputOptions (); - const ScPrintOptions& GetPrintOptions (); +SC_DLLPUBLIC const ScDocOptions& GetDocOptions (); +SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); +SC_DLLPUBLIC const ScDefaultsOptions& GetDefaultsOptions (); + SC_DLLPUBLIC const ScFormulaOptions& GetFormulaOptions (); + SC_DLLPUBLIC const ScInputOptions& GetInputOptions (); +SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); void SetViewOptions ( const ScViewOptions& rOpt ); - void SetDocOptions ( const ScDocOptions& rOpt ); - void SetAppOptions ( const ScAppOptions& rOpt ); +SC_DLLPUBLIC void SetDocOptions ( const ScDocOptions& rOpt ); +SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); void SetDefaultsOptions ( const ScDefaultsOptions& rOpt ); - void SetFormulaOptions ( const ScFormulaOptions& rOpt ); - void SetInputOptions ( const ScInputOptions& rOpt ); + SC_DLLPUBLIC void SetFormulaOptions ( const ScFormulaOptions& rOpt ); + SC_DLLPUBLIC void SetInputOptions ( const ScInputOptions& rOpt ); void SetPrintOptions ( const ScPrintOptions& rOpt ); void InsertEntryToLRUList(sal_uInt16 nFIndex); void RecentFunctionsChanged(); @@ -199,7 +199,7 @@ public: svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessOptions(); SvtCTLOptions& GetCTLOptions(); - SvtUserOptions& GetUserOptions(); + SC_DLLPUBLIC SvtUserOptions& GetUserOptions(); void ModifyOptions( const SfxItemSet& rOptSet ); @@ -208,7 +208,7 @@ public: bool IsInputMode(); // also for SC_INPUT_TYPE void SetInputMode( ScInputMode eMode, const OUString* pInitText = NULL ); bool InputKeyEvent( const KeyEvent& rKEvt, bool bStartEdit = false ); - void InputEnterHandler( sal_uInt8 nBlockMode = 0 ); + SC_DLLPUBLIC void InputEnterHandler( sal_uInt8 nBlockMode = 0 ); void InputCancelHandler(); void InputSelection( EditView* pView ); void InputChanged( EditView* pView ); @@ -233,7 +233,7 @@ public: ScFormEditData* GetFormEditData() { return pFormEditData; } // input of reference: - void SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = NULL ); + SC_DLLPUBLIC void SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = NULL ); bool IsModalMode(SfxObjectShell* pDocSh = NULL); bool IsFormulaMode(); bool IsRefDialogOpen(); @@ -254,9 +254,9 @@ public: void SetInSharedDocSaving( bool bNew ) { mbIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return mbIsInSharedDocSaving; } - bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); - vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); + SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); ScAnyRefModalDlg* GetCurrentAnyRefDlg(); void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg ); diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 640c65802d61..e83aef029727 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -25,7 +25,7 @@ class ScStyleSheet; class ScDocument; -class SC_DLLPUBLIC ScStyleSheetPool : public SfxStyleSheetPool +class ScStyleSheetPool : public SfxStyleSheetPool { public: ScStyleSheetPool( SfxItemPool& rPool, diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 85f42f900de6..cb65a01028bb 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -26,7 +26,7 @@ class ScStyleSheetPool; -class SC_DLLPUBLIC ScStyleSheet : public SfxStyleSheet +class ScStyleSheet : public SfxStyleSheet { friend class ScStyleSheetPool; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index 4a87aaccceee..5083c989a105 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -75,7 +75,7 @@ public: const ImageMap& GetImageMap() const { return aImageMap; } }; -class SC_DLLPUBLIC ScMacroInfo : public SdrObjUserData +class ScMacroInfo : public SdrObjUserData { public: ScMacroInfo(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 181376c9cfa2..6f6d2c0c7d04 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -92,7 +92,7 @@ public: DECL_LINK( ColFormatTypeHdl, ListBox*); }; -class SC_DLLPUBLIC ScCondFormatDlg : public ScAnyRefModalDlg +class ScCondFormatDlg : public ScAnyRefModalDlg { private: PushButton* mpBtnAdd; diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 7ae49cf9695e..207fdbfdbce9 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -36,7 +36,7 @@ class ScDPSaveData; struct ScDPNumGroupInfo; struct ScSubTotalParam; -class SC_DLLPUBLIC ScDBFunc : public ScViewFunc +class ScDBFunc : public ScViewFunc { private: void GetSelectedMemberList(ScDPUniqueStringSet& rEntries, long& rDimension); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 8b22bb9f3870..0221e601b8ae 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -81,7 +81,7 @@ struct SpellCallbackInfo; // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} -class SC_DLLPUBLIC ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper +class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper { // ScFilterListBox is always used for selection list friend class ScFilterListBox; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index b8b266c6c219..bcf4fbc66d15 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -29,7 +29,7 @@ class ScDocShell; class ScPreviewShell; class FmFormView; -class SC_DLLPUBLIC ScPreview : public vcl::Window +class ScPreview : public vcl::Window { private: ScMarkData::MarkedTabsType maSelectedTabs; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 93e43a2454b1..d8bec53db738 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,7 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; -class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell +class ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 17e7ebc72b1f..81e800450180 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,7 @@ enum ObjectSelectionType OST_Media }; -class SC_DLLPUBLIC ScTabViewShell: public SfxViewShell, public ScDBFunc +class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: static sal_uInt16 nInsertCtrlState; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 4d2b85c97c8d..57d8ea6f8954 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { #include <sfx2/objsh.hxx> -class SC_DLLPUBLIC ScTransferObj : public TransferableHelper +class ScTransferObj : public TransferableHelper { private: ScDocument* pDoc; |