Kaydet (Commit) a21118b0 authored tarafından David Tardon's avatar David Tardon

fix windows build

error C2487: member of dll interface class may not be declared with dll
interface

Change-Id: I63898789eb9c9ee767a5c72e31156e23d50c81fb
üst 6b846cad
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
void GetState(SfxItemSet&); void GetState(SfxItemSet&);
SdOptions* GetSdOptions(DocumentType eDocType); SdOptions* GetSdOptions(DocumentType eDocType);
SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
bool GetWaterCan() const { return bWaterCan; } bool GetWaterCan() const { return bWaterCan; }
void SetWaterCan( bool bWC ) { bWaterCan = bWC; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; }
...@@ -120,7 +120,7 @@ public: ...@@ -120,7 +120,7 @@ public:
*/ */
OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell); OutputDevice* GetRefDevice (::sd::DrawDocShell& rDocShell);
SD_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); SvNumberFormatter* GetNumberFormatter();
// virtual methods for the option dialog // virtual methods for the option dialog
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
......
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
had to be created. This is used to assert errors in documents had to be created. This is used to assert errors in documents
when styles are missing. when styles are missing.
*/ */
SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const; void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets); void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets ); void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
......
...@@ -149,11 +149,11 @@ public: ...@@ -149,11 +149,11 @@ public:
inline ::sd::View* GetView() const { return mpView; } inline ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const; inline SdrView* GetDrawView() const;
SD_DLLPUBLIC DrawDocShell* GetDocSh() const; DrawDocShell* GetDocSh() const;
SdDrawDocument* GetDoc() const; SdDrawDocument* GetDoc() const;
SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const; SfxViewFrame* GetViewFrame() const;
/** The active window is usually the mpContentWindow. When there is a /** The active window is usually the mpContentWindow. When there is a
show running then the active window is a ShowWindow. show running then the active window is a ShowWindow.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment