summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svl/inc/svl/smplhint.hxx10
-rw-r--r--svl/source/notify/makefile.mk1
-rw-r--r--svtools/source/control/inettbc.cxx1
-rw-r--r--unotools/inc/unotools/saveopt.hxx4
-rw-r--r--unotools/source/config/saveopt.cxx60
5 files changed, 14 insertions, 62 deletions
diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index 089a86dae3f2..f8f4b45375f5 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -42,14 +42,14 @@
#define SFX_HINT_UPDATEDONE 0x00000020
#define SFX_HINT_DEINITIALIZING 0x00000040
#define SFX_HINT_MODECHANGED 0x00000080
-#define SFX_HINT_CANCELLABLE 0x00000100
-#define SFX_HINT_DATAAVAILABLE 0x00000200
-#define SFX_HINT_SAVECOMPLETED 0x00000400
-#define SFX_HINT_RELEASEREF 0x00000800
+ // unused, formerly SFX_HINT_CANCELLABLE
+ // unused, formerly SFX_HINT_DATAAVAILABLE
+ // unused, formerly SFX_HINT_SAVECOMPLETED
+ // unused, formerly SFX_HINT_RELEASEREF
#define SFX_HINT_COLORS_CHANGED 0x00001000
#define SFX_HINT_CTL_SETTINGS_CHANGED 0x00002000
#define SFX_HINT_ACCESSIBILITY_CHANGED 0x00004000
-#define SFX_HINT_VIEWCREATED 0x00008000
+ // unused, formerly SFX_HINT_VIEWCREATED
#define SFX_HINT_USER00 0x00010000
#define SFX_HINT_USER01 0x00020000
#define SFX_HINT_USER02 0x00040000
diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk
index 0d26860d02b5..58712b93fa9f 100644
--- a/svl/source/notify/makefile.mk
+++ b/svl/source/notify/makefile.mk
@@ -46,7 +46,6 @@ SLOFILES = \
$(SLO)$/hint.obj \
$(SLO)$/lstner.obj \
$(SLO)$/isethint.obj \
- $(SLO)$/cancel.obj \
$(SLO)$/brdcst.obj \
$(SLO)$/listener.obj \
$(SLO)$/listenerbase.obj \
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index b4904afee418..b00a9b95c1a4 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -69,7 +69,6 @@
#include <unotools/historyoptions.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <svl/cancel.hxx>
#include <svl/itemset.hxx>
#include "svl/urihelper.hxx"
#include <unotools/pathoptions.hxx>
diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index bb50cadafb1d..fdb27319e503 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -49,7 +49,6 @@ public:
E_AUTOSAVEPROMPT,
E_DOCINFSAVE,
E_SAVEWORKINGSET,
- E_SAVEDOCWINS,
E_SAVEDOCVIEW,
E_SAVERELINET,
E_SAVERELFSYS,
@@ -96,9 +95,6 @@ public:
void SetSaveWorkingSet( sal_Bool b );
sal_Bool IsSaveWorkingSet() const;
- void SetSaveDocWins( sal_Bool b );
- sal_Bool IsSaveDocWins() const;
-
void SetSaveDocView( sal_Bool b );
sal_Bool IsSaveDocView() const;
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 49e01c0457e9..7c00b35fa14c 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -76,7 +76,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bAutoSavePrompt,
bDocInfSave,
bSaveWorkingSet,
- bSaveDocWins,
bSaveDocView,
bSaveRelINet,
bSaveRelFSys,
@@ -92,7 +91,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bROAutoSavePrompt,
bRODocInfSave,
bROSaveWorkingSet,
- bROSaveDocWins,
bROSaveDocView,
bROSaveRelINet,
bROSaveRelFSys,
@@ -118,7 +116,6 @@ public:
BOOL IsAutoSavePrompt() const { return bAutoSavePrompt; }
BOOL IsDocInfoSave() const { return bDocInfSave; }
BOOL IsSaveWorkingSet() const { return bSaveWorkingSet; }
- BOOL IsSaveDocWins() const { return bSaveDocWins; }
BOOL IsSaveDocView() const { return bSaveDocView; }
BOOL IsSaveRelINet() const { return bSaveRelINet; }
BOOL IsSaveRelFSys() const { return bSaveRelFSys; }
@@ -136,7 +133,6 @@ public:
void SetAutoSavePrompt( BOOL b );
void SetDocInfoSave( BOOL b );
void SetSaveWorkingSet( BOOL b );
- void SetSaveDocWins( BOOL b );
void SetSaveDocView( BOOL b );
void SetSaveRelINet( BOOL b );
void SetSaveRelFSys( BOOL b );
@@ -214,15 +210,6 @@ void SvtSaveOptions_Impl::SetSaveWorkingSet( BOOL b )
}
}
-void SvtSaveOptions_Impl::SetSaveDocWins( BOOL b )
-{
- if (!bROSaveDocWins && bSaveDocWins!=b)
- {
- bSaveDocWins = b;
- SetModified();
- }
-}
-
void SvtSaveOptions_Impl::SetSaveDocView( BOOL b )
{
if (!bROSaveDocView && bSaveDocView!=b)
@@ -321,9 +308,6 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
case SvtSaveOptions::E_SAVEWORKINGSET :
bReadOnly = bROSaveWorkingSet;
break;
- case SvtSaveOptions::E_SAVEDOCWINS :
- bReadOnly = bROSaveDocWins;
- break;
case SvtSaveOptions::E_SAVEDOCVIEW :
bReadOnly = bROSaveDocView;
break;
@@ -359,16 +343,15 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
#define AUTOSAVE 4
#define PROMPT 5
#define EDITPROPERTY 6
-#define SAVEDOCWINS 7
-#define SAVEVIEWINFO 8
-#define UNPACKED 9
-#define PRETTYPRINTING 10
-#define WARNALIENFORMAT 11
-#define LOADDOCPRINTER 12
-#define FILESYSTEM 13
-#define INTERNET 14
-#define SAVEWORKINGSET 15
-#define ODFDEFAULTVERSION 16
+#define SAVEVIEWINFO 7
+#define UNPACKED 8
+#define PRETTYPRINTING 9
+#define WARNALIENFORMAT 10
+#define LOADDOCPRINTER 11
+#define FILESYSTEM 12
+#define INTERNET 13
+#define SAVEWORKINGSET 14
+#define ODFDEFAULTVERSION 15
Sequence< OUString > GetPropertyNames()
{
@@ -381,7 +364,6 @@ Sequence< OUString > GetPropertyNames()
"Document/AutoSave",
"Document/AutoSavePrompt",
"Document/EditProperty",
- "Document/DocumentWindows",
"Document/ViewInfo",
"Document/Unpacked",
"Document/PrettyPrinting",
@@ -413,7 +395,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
, bAutoSavePrompt( sal_False )
, bDocInfSave( sal_False )
, bSaveWorkingSet( sal_False )
- , bSaveDocWins( sal_False )
, bSaveDocView( sal_False )
, bSaveRelINet( sal_False )
, bSaveRelFSys( sal_False )
@@ -428,7 +409,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
, bROAutoSavePrompt( CFG_READONLY_DEFAULT )
, bRODocInfSave( CFG_READONLY_DEFAULT )
, bROSaveWorkingSet( CFG_READONLY_DEFAULT )
- , bROSaveDocWins( CFG_READONLY_DEFAULT )
, bROSaveDocView( CFG_READONLY_DEFAULT )
, bROSaveRelINet( CFG_READONLY_DEFAULT )
, bROSaveRelFSys( CFG_READONLY_DEFAULT )
@@ -518,10 +498,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
bSaveWorkingSet = bTemp;
bROSaveWorkingSet = pROStates[nProp];
break;
- case SAVEDOCWINS :
- bSaveDocWins = bTemp;
- bROSaveDocWins = pROStates[nProp];
- break;
case SAVEVIEWINFO :
bSaveDocView = bTemp;
bROSaveDocView = pROStates[nProp];
@@ -667,14 +643,6 @@ void SvtSaveOptions_Impl::Commit()
++nRealCount;
}
break;
- case SAVEDOCWINS :
- if (!bROSaveDocWins)
- {
- pValues[nRealCount] <<= bSaveDocWins;
- pNames[nRealCount] = pOrgNames[i];
- ++nRealCount;
- }
- break;
case SAVEVIEWINFO :
if (!bROSaveDocView)
{
@@ -940,16 +908,6 @@ sal_Bool SvtSaveOptions::IsSaveWorkingSet() const
return pImp->pSaveOpt->IsSaveWorkingSet();
}
-void SvtSaveOptions::SetSaveDocWins( sal_Bool b )
-{
- pImp->pSaveOpt->SetSaveDocWins( b );
-}
-
-sal_Bool SvtSaveOptions::IsSaveDocWins() const
-{
- return pImp->pSaveOpt->IsSaveDocWins();
-}
-
void SvtSaveOptions::SetSaveDocView( sal_Bool b )
{
pImp->pSaveOpt->SetSaveDocView( b );
generated by cgit (git 2.34.1) at 2025-01-23 00:17:01 +0000