CWS-TOOLING: integrate CWS calc53

4 files changed, 2 insertions, 10 deletions

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index bca93e7aa441..a9c1997f74f5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -353,7 +353,7 @@
 #define STR_SCATTR_PAGE_SCALETOPAGES 277
 
 #define STR_NOREF_STR               278     /* moved to compiler.src, keep define! */
-#define STR_ODER_SO                 279
+// unused: 279
 
 #define STR_UNDO_CHARTDATA          280
 #define STR_UNDO_ORIGINALSIZE       281
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a7d05925957a..c2bf3e96ed5c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1146,9 +1146,6 @@
 #define RID_IMGLIST_INPUTWIN    (SC_RESOURCE_START+22)
 #define RID_ERRHDLSC            (SC_RESOURCE_START+23)
 #define RID_POPUP_GRAPHIC       (SC_RESOURCE_START+24)
-#define RID_SCTEAMDLGBMP1       (SC_RESOURCE_START+25)
-#define RID_SCTEAMDLGBMP2       (SC_RESOURCE_START+26)
-#define RID_SCTEAMDLGBMP3       (SC_RESOURCE_START+27)
 #define RID_POPUP_DRAWTEXT      (SC_RESOURCE_START+29)
 #define RID_MN_FORMAT_ALGN      (SC_RESOURCE_START+30)
 #define RID_MN_FORMAT_STYLE     (SC_RESOURCE_START+31)
@@ -1530,7 +1527,6 @@
 #define RID_SCDLG_NAMES_PASTE           (SC_DIALOGS_START + 72)
 #define RID_SCDLG_NAMES_CREATE          (SC_DIALOGS_START + 73)
 #define RID_SCDLG_NAMES_APPLY           (SC_DIALOGS_START + 74) //NYI
-#define RID_SCDLG_TEAM                  (SC_DIALOGS_START + 75)
 
 #define RID_SCDLG_CHAR                  (SC_DIALOGS_START + 76)
 #define RID_SCDLG_PARAGRAPH             (SC_DIALOGS_START + 77)
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index ee2c956e7742..984e36bec03e 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -74,7 +74,6 @@ class ScInputWindow;
 class ScTabViewShell;
 class ScFunctionDlg;
 class ScArgDlgBase;
-class ScTeamDlg;
 class ScEditFunctionDlg;
 class ScMessagePool;
 class EditFieldInfo;
@@ -126,7 +125,6 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
     ScMessagePool*      pMessagePool;
     //  globalen InputHandler gibt's nicht mehr, jede View hat einen
     ScInputHandler*     pRefInputHandler;
-    ScTeamDlg*          pTeamDlg;
     ScViewCfg*          pViewCfg;
     ScDocCfg*           pDocCfg;
     ScAppCfg*           pAppCfg;
@@ -268,9 +266,6 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     BOOL                IsFormulaMode();
     BOOL                IsRefDialogOpen();
     BOOL                IsTableLocked();
-    void                OpenTeamDlg();
-    void                SetTeamDlg( ScTeamDlg* pDlg )           { pTeamDlg = pDlg; }
-    ScTeamDlg*          GetTeamDlg() const                      { return pTeamDlg; }
     void                SetReference( const ScRange& rRef, ScDocument* pDoc,
                                         const ScMarkData* pMarkData = NULL );
     void                AddRefEntry();
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 5bcc22ae72d3..330251742870 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -596,6 +596,7 @@
 #define SC_UNONAME_PAGESIZE         "PageSize"
 #define SC_UNONAME_RENDERDEV        "RenderDevice"
 #define SC_UNONAME_SOURCERANGE      "SourceRange"
+#define SC_UNONAME_INC_NP_AREA      "PageIncludesNonprintableArea"
 
 // CellValueBinding
 #define SC_UNONAME_BOUNDCELL        "BoundCell"