diff options
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/docmacromode.hxx | 2 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 12 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 2 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 1 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/titledockwin.hxx | 2 |
5 files changed, 14 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx index c716b0e428e5..cf9e9ac6729c 100644 --- a/sfx2/inc/sfx2/docmacromode.hxx +++ b/sfx2/inc/sfx2/docmacromode.hxx @@ -107,7 +107,7 @@ namespace sfx2 virtual ::rtl::OUString getDocumentLocation() const = 0; - /** returns a zip-storage based on the last commited version of the document, + /** returns a zip-storage based on the last committed version of the document, for readonly access The storage is intended to be used for signing. An implementation is diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index cda7eb3ae561..dc2826139f8b 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -214,8 +214,16 @@ private: sal_Bool bHasName :1, // sal_True := bestehendes Objekt, sal_False := es ist ein neues Objekt bIsTmp :1; // temp. Storage sal_Bool bIsInGenerateThumbnail; //optimize thumbnail generate and store procedure to improve odt saving performance, i120030 - virtual void BeforeLoading( SfxMedium&, const ::rtl::OUString &, const ::rtl::OUString & ){}; - virtual void AfterLoading( SfxMedium&, const ::rtl::OUString &, const ::rtl::OUString & ){}; + +protected: + // methods called in implementation of <ImportFrom(..)> + virtual void BeforeLoading( SfxMedium&, const ::rtl::OUString &, const ::rtl::OUString & ) + { + }; + + virtual void AfterLoading( SfxMedium&, const ::rtl::OUString &, const ::rtl::OUString & ) + { + }; private: //#if 0 // _SOLAR__PRIVATE diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 0af678a5ee18..2bdc403759c7 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -386,7 +386,7 @@ public: /**___________________________________________________________________________________________________ @short get implementation id - @descr This ID is neccessary for UNO-caching. If there no ID, cache is disabled. + @descr This ID is necessary for UNO-caching. If there no ID, cache is disabled. Another way, cache is enabled. @seealso XTypeProvider diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 2b5e8044a706..801e18e100a7 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -837,6 +837,7 @@ #define SID_OPT_MIDDLE_MOUSE (SID_OPTIONS_START + 97) #define SID_ATTR_PRETTYPRINTING (SID_OPTIONS_START + 98) #define SID_HELP_STYLESHEET (SID_OPTIONS_START + 99) +#define SID_ATTR_ODFENCRYPTION (SID_OPTIONS_START + 100) // slot IDs from SVX (svxids.hrc) --------------------------------------------- diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index 0a76023caf36..b12a71ee22a6 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -145,7 +145,7 @@ namespace sfx2 Link m_aEndDockingHdl; - /** The border that is painted arround the inner window. The bevel + /** The border that is painted around the inner window. The bevel shadow lines are part of the border, so where the border is 0 no such line is painted. */ |