[Libreoffice-commits] .: sfx2/inc sfx2/sdi sfx2/source sw/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Mon Jun 11 13:05:44 PDT 2012


 sfx2/inc/sfx2/sfxcommands.h  |    2 --
 sfx2/inc/sfx2/sfxsids.hrc    |    1 -
 sfx2/sdi/sfx.sdi             |   27 ---------------------------
 sfx2/source/appl/appbas.cxx  |    5 -----
 sfx2/source/doc/doc.hrc      |    1 -
 sfx2/source/doc/doc.src      |    4 ----
 sw/source/ui/docvw/docvw.hrc |    2 +-
 7 files changed, 1 insertion(+), 41 deletions(-)

New commits:
commit da38cd454a7d32b92dbdd1dd0abdce27c4ee2327
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Jun 11 22:05:04 2012 +0200

    Remove unused InterceptChildWindowKeyDown: further cleanup
    
    Change-Id: I497b18aff8e571dd5f028325c16a7292f4f80692

diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index 31109d5..ebb1da1 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -257,8 +257,6 @@
 #define CMD_SID_SHOWPOPUPS                          ".uno:ShowPopups"
 #define CMD_SID_BASICIDE_SHOWSBX                    ".uno:ShowSbx"
 #define CMD_SID_SOURCEVIEW                          ".uno:SourceView"
-#define CMD_SID_STATUSBARTEXT                       ".uno:StatusBar"
-#define CMD_SID_TOGGLESTATUSBAR                     ".uno:StatusBarVisible"
 #define CMD_SID_BASICIDE_STAT_DATE                  ".uno:StatusGetDate"
 #define CMD_SID_BASICIDE_STAT_POS                   ".uno:StatusGetPosition"
 #define CMD_SID_BASICIDE_STAT_TITLE                 ".uno:StatusGetTitle"
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 53fd3ee..c6a86f1 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -486,7 +486,6 @@
 #define SID_RESTOREWIN                      (SID_SFX_START + 635)
 
 #define SID_CAPTION                         (SID_SFX_START + 641)
-#define SID_STATUSBARTEXT                   (SID_SFX_START + 642)
 
 // id for thesaurs entry in context menu
 #define SID_THES                            (SID_SFX_START + 698)
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 396fbb7..e1dd418 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6084,33 +6084,6 @@ SfxBoolItem SourceView SID_SOURCEVIEW
 ]
 
 //--------------------------------------------------------------------------
-SfxStringItem StatusBar SID_STATUSBARTEXT
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = ;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem StatusBarVisible SID_TOGGLESTATUSBAR
 
 [
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 1e79632..cc34ae2 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -248,11 +248,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
             break;
         }
 
-        case SID_STATUSBARTEXT:
-        {
-            break;
-        }
-
         case SID_OFFICE_PRIVATE_USE:
         case SID_OFFICE_COMMERCIAL_USE:
         {
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index aca8a3a..dbff52d 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -101,7 +101,6 @@
 #define RID_STR_WARNSTYLEOVERWRITE          (RID_SFX_DOC_START+ 54)
 #define RID_DLSTATUS                        (RID_SFX_DOC_START+ 55)
 
-#define STR_DOC_LOADING                     (RID_SFX_DOC_START+ 57)
 #define MSG_OPEN_READONLY                   (RID_SFX_DOC_START+ 58)
 
 #define RID_OFFICEFILTER                    (RID_SFX_DOC_START+ 59)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 4d99ae1..0222868 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -229,10 +229,6 @@ String RID_STR_WARNSTYLEOVERWRITE
 {
     Text [ en-US ] = "Should the \"$(ARG1)\" Style be replaced?" ;
 };
-String STR_DOC_LOADING
-{
-    Text [ en-US ] = "Loading Document" ;
-};
 Resource RID_DLSTATUS
 {
     String INET_NAME_RESOLVE_START
diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc
index 305fb5b..bf75602 100644
--- a/sw/source/ui/docvw/docvw.hrc
+++ b/sw/source/ui/docvw/docvw.hrc
@@ -58,7 +58,7 @@
 
 
 #define STR_EXPORT_GRAFIK_TITLE         (RC_DOCVW_BEGIN + 1)
-#define STR_CHAIN_OK                    (RC_DOCVW_BEGIN + 2)
+    // FREE, was STR_CHAIN_OK
 #define STR_CHAIN_NOT_EMPTY             (RC_DOCVW_BEGIN + 3)
 #define STR_CHAIN_IS_IN_CHAIN           (RC_DOCVW_BEGIN + 4)
 #define STR_CHAIN_WRONG_AREA            (RC_DOCVW_BEGIN + 5)


More information about the Libreoffice-commits mailing list