Merge branch 'master' into feature/gnumake4

5 files changed, 86 insertions, 14 deletions

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 273fb3d3ef45..5435a01da858 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -246,7 +246,6 @@ public:
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStream_Impl();
     SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl();
-    SAL_DLLPRIVATE void RefreshName_Impl();
     SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( com::sun::star::util::RevisionTag& rVersion );
     SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium );
     SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML );
@@ -254,8 +253,6 @@ public:
 
     SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime );
     SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl();
-    SAL_DLLPRIVATE const String& GetPreRedirectedURL() const;
-    SAL_DLLPRIVATE void SetOrigFilter_Impl( const SfxFilter* pFilter );
 
     // Diese Protokolle liefern MIME Typen
     SAL_DLLPRIVATE sal_Bool SupportsMIME_Impl() const;
@@ -275,12 +272,9 @@ public:
                         { aLongName = rName; }
     SAL_DLLPRIVATE const String & GetLongName() const { return aLongName; }
     SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True );
-    SAL_DLLPRIVATE sal_Bool IsDownloadDone_Impl();
     SAL_DLLPRIVATE sal_Bool IsPreview_Impl();
     SAL_DLLPRIVATE void ClearBackup_Impl();
     SAL_DLLPRIVATE void Done_Impl( ErrCode );
-    SAL_DLLPRIVATE void DataAvailable_Impl();
-    SAL_DLLPRIVATE void Cancel_Impl();
     SAL_DLLPRIVATE void SetPhysicalName_Impl(const String& rName);
     SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage );
     SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl();
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index c6d007bea86d..b365ab9efebd 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -52,7 +52,7 @@ protected:
 
 public:
     // These methods can also be used by other parsers.
-    static void             ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& );
+    static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const String& );
 
 };
 
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index f8bd9e7ffb9d..4b1fb074e4b8 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -82,8 +82,6 @@ public:
 
     DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
     DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
-    SAL_DLLPRIVATE bool  StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
-    SAL_DLLPRIVATE const String& GetStateText_Impl() const;
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 9a03eb3afacb..88e3cecf026e 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -65,12 +65,11 @@ public:
     // Read the options of an image map
     // <MAP>: sal_True = Image-Map has a name
     // <AREA>: sal_True = Image-Map has now one Region more
-    static sal_Bool ParseMapOptions(ImageMap * pImageMap,
-                                const HTMLOptions * pOptions );
-    sal_Bool ParseMapOptions(ImageMap * pImageMap)
+    static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions);
+    bool ParseMapOptions(ImageMap * pImageMap)
     { return ParseMapOptions(pImageMap, GetOptions()); }
-    static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
-                                 const HTMLOptions * pOptions,
+    static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+                                 const HTMLOptions& rOptions,
                                  sal_uInt16 nEventMouseOver = 0,
                                  sal_uInt16 nEventMouseOut = 0 );
     inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
diff --git a/sfx2/inc/sfx2/templatelocnames.hrc b/sfx2/inc/sfx2/templatelocnames.hrc
new file mode 100644
index 000000000000..2b659e048195
--- /dev/null
+++ b/sfx2/inc/sfx2/templatelocnames.hrc
@@ -0,0 +1,81 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Péter Rabi <prabi@caesar.elte.hu>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#define NUM_TEMPLATE_NAMES      25
+#define TEMPL_LOC_OFFSET        2190
+
+#define STR_TEMPLATE_NAME1_DEF      (TEMPL_LOC_OFFSET + 1)
+#define STR_TEMPLATE_NAME2_DEF      (TEMPL_LOC_OFFSET + 2)
+#define STR_TEMPLATE_NAME3_DEF      (TEMPL_LOC_OFFSET + 3)
+#define STR_TEMPLATE_NAME4_DEF      (TEMPL_LOC_OFFSET + 4)
+#define STR_TEMPLATE_NAME5_DEF      (TEMPL_LOC_OFFSET + 5)
+#define STR_TEMPLATE_NAME6_DEF      (TEMPL_LOC_OFFSET + 6)
+#define STR_TEMPLATE_NAME7_DEF      (TEMPL_LOC_OFFSET + 7)
+#define STR_TEMPLATE_NAME8_DEF      (TEMPL_LOC_OFFSET + 8)
+#define STR_TEMPLATE_NAME9_DEF      (TEMPL_LOC_OFFSET + 9)
+#define STR_TEMPLATE_NAME10_DEF     (TEMPL_LOC_OFFSET + 10)
+#define STR_TEMPLATE_NAME11_DEF     (TEMPL_LOC_OFFSET + 11)
+#define STR_TEMPLATE_NAME12_DEF     (TEMPL_LOC_OFFSET + 12)
+#define STR_TEMPLATE_NAME13_DEF     (TEMPL_LOC_OFFSET + 13)
+#define STR_TEMPLATE_NAME14_DEF     (TEMPL_LOC_OFFSET + 14)
+#define STR_TEMPLATE_NAME15_DEF     (TEMPL_LOC_OFFSET + 15)
+#define STR_TEMPLATE_NAME16_DEF     (TEMPL_LOC_OFFSET + 16)
+#define STR_TEMPLATE_NAME17_DEF     (TEMPL_LOC_OFFSET + 17)
+#define STR_TEMPLATE_NAME18_DEF     (TEMPL_LOC_OFFSET + 18)
+#define STR_TEMPLATE_NAME19_DEF     (TEMPL_LOC_OFFSET + 19)
+#define STR_TEMPLATE_NAME20_DEF     (TEMPL_LOC_OFFSET + 20)
+#define STR_TEMPLATE_NAME21_DEF     (TEMPL_LOC_OFFSET + 21)
+#define STR_TEMPLATE_NAME22_DEF     (TEMPL_LOC_OFFSET + 22)
+#define STR_TEMPLATE_NAME23_DEF     (TEMPL_LOC_OFFSET + 23)
+#define STR_TEMPLATE_NAME24_DEF     (TEMPL_LOC_OFFSET + 24)
+#define STR_TEMPLATE_NAME25_DEF     (TEMPL_LOC_OFFSET + 25)
+
+#define STR_TEMPLATE_NAME1      (TEMPL_LOC_OFFSET + 51)
+#define STR_TEMPLATE_NAME2      (TEMPL_LOC_OFFSET + 52)
+#define STR_TEMPLATE_NAME3      (TEMPL_LOC_OFFSET + 53)
+#define STR_TEMPLATE_NAME4      (TEMPL_LOC_OFFSET + 54)
+#define STR_TEMPLATE_NAME5      (TEMPL_LOC_OFFSET + 55)
+#define STR_TEMPLATE_NAME6      (TEMPL_LOC_OFFSET + 56)
+#define STR_TEMPLATE_NAME7      (TEMPL_LOC_OFFSET + 57)
+#define STR_TEMPLATE_NAME8      (TEMPL_LOC_OFFSET + 58)
+#define STR_TEMPLATE_NAME9      (TEMPL_LOC_OFFSET + 59)
+#define STR_TEMPLATE_NAME10     (TEMPL_LOC_OFFSET + 60)
+#define STR_TEMPLATE_NAME11     (TEMPL_LOC_OFFSET + 61)
+#define STR_TEMPLATE_NAME12     (TEMPL_LOC_OFFSET + 62)
+#define STR_TEMPLATE_NAME13     (TEMPL_LOC_OFFSET + 63)
+#define STR_TEMPLATE_NAME14     (TEMPL_LOC_OFFSET + 64)
+#define STR_TEMPLATE_NAME15     (TEMPL_LOC_OFFSET + 65)
+#define STR_TEMPLATE_NAME16     (TEMPL_LOC_OFFSET + 66)
+#define STR_TEMPLATE_NAME17     (TEMPL_LOC_OFFSET + 67)
+#define STR_TEMPLATE_NAME18     (TEMPL_LOC_OFFSET + 68)
+#define STR_TEMPLATE_NAME19     (TEMPL_LOC_OFFSET + 69)
+#define STR_TEMPLATE_NAME20     (TEMPL_LOC_OFFSET + 70)
+#define STR_TEMPLATE_NAME21     (TEMPL_LOC_OFFSET + 71)
+#define STR_TEMPLATE_NAME22     (TEMPL_LOC_OFFSET + 72)
+#define STR_TEMPLATE_NAME23     (TEMPL_LOC_OFFSET + 73)
+#define STR_TEMPLATE_NAME24     (TEMPL_LOC_OFFSET + 74)
+#define STR_TEMPLATE_NAME25     (TEMPL_LOC_OFFSET + 75)