officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 4
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4
sd/source/ui/app/optsitem.cxx | 50 ------------
sd/source/ui/inc/optsitem.hxx | 18 ----
4 files changed, 9 insertions(+), 67 deletions(-)
New commits:
commit 88ccd5e71143e3a3676fb1eaeb9e16f522a90784
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Wed Apr 3 22:32:38 2024 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Sat Apr 13 09:41:11 2024 +0200
Mark obsolete Impress/Draw config keys as deprecated
Practically unused since 2007 commit
56ca5814a1843a31d23b249f1960a31532c6b5bd
Change-Id: Idd7cf4f239efed16a151fc4c755c249947d927f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165859
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index c7ce19c2d6f4..dc6fa42f9e04 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -187,6 +187,7 @@
<info>
<desc>Indicates whether to show only outlines of graphical
objects.</desc>
<label>Image placeholders</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -195,6 +196,7 @@
<info>
<desc>Indicates whether to show only outlines of draw
objects.</desc>
<label>Contour mode</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -203,6 +205,7 @@
<info>
<desc>Indicates whether to use placeholders for text in draw
objects.</desc>
<label>Text placeholders</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -211,6 +214,7 @@
<info>
<desc>Indicates whether to show only hairlines instead of an
object's linestyle.</desc>
<label>Line contour only</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 876780d1bd09..e6bda773491f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -290,6 +290,7 @@
<info>
<desc>Indicates whether to show only the bounding box of
graphic-objects like bitmaps and drawings.</desc>
<label>Image placeholders</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -298,6 +299,7 @@
<info>
<desc>Indicates whether to show only outlines of objects such as
filled rectangles and filled ellipses.</desc>
<label>Contour mode</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -306,6 +308,7 @@
<info>
<desc>Indicates whether to show only a placeholder for text in
graphical objects.</desc>
<label>Text placeholders</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
@@ -314,6 +317,7 @@
<info>
<desc>Indicates whether to show only hairlines instead of the true
line styles.</desc>
<label>Line contour only</label>
+ <deprecated>Not used anymore</deprecated>
</info>
<value>false</value>
</prop>
commit 912aa66a0623787eb2e29d01780140be6cccf27e
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Wed Apr 3 20:52:15 2024 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Sat Apr 13 09:40:57 2024 +0200
Drop unused SdOptionsContents class
seems to be practically out of use since 2007 commit
56ca5814a1843a31d23b249f1960a31532c6b5bd
part of patch series '#i80528# Removal of draft paint modes'
Change-Id: I770bab8b1973bec099ffdaa3243f1c0d2995ee52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165858
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 925cfaa15662..1aee9d7d7afc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -336,54 +336,6 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts )
const
}
}
-/*************************************************************************
-|*
-|* SdOptionsContents
-|*
-\************************************************************************/
-
-SdOptionsContents::SdOptionsContents(bool bImpress) :
- SdOptionsGeneric( bImpress, bImpress ?
- OUString( "Office.Impress/Content" ) :
- OUString( "Office.Draw/Content" ) )
-{
- EnableModify( true );
-}
-
-bool SdOptionsContents::operator==(const SdOptionsContents&) const
-{
- return true;
-}
-
-void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong&
rCount ) const
-{
- static const char* aPropNames[] =
- {
- "Display/PicturePlaceholder",
- "Display/ContourMode",
- "Display/LineContour",
- "Display/TextPlaceholder"
- };
-
- rCount = SAL_N_ELEMENTS(aPropNames);
- ppNames = aPropNames;
-}
-
-bool SdOptionsContents::ReadData(const Any*)
-{
- return true;
-}
-
-bool SdOptionsContents::WriteData( Any* pValues ) const
-{
- //#i80528# no draft anymore
- pValues[ 0 ] <<= false;
- pValues[ 1 ] <<= false;
- pValues[ 2 ] <<= false;
- pValues[ 3 ] <<= false;
-
- return true;
-}
/*************************************************************************
|*
|* SdOptionsMisc
@@ -1342,7 +1294,6 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts )
const
SdOptions::SdOptions(bool bImpress) :
SdOptionsLayout( bImpress, true ),
- SdOptionsContents( bImpress ),
SdOptionsMisc( bImpress, true ),
SdOptionsSnap( bImpress, true ),
SdOptionsZoom( bImpress ),
@@ -1358,7 +1309,6 @@ SdOptions::~SdOptions()
void SdOptions::StoreConfig()
{
SdOptionsLayout::Store();
- SdOptionsContents::Store();
SdOptionsMisc::Store();
SdOptionsSnap::Store();
SdOptionsZoom::Store();
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 3a71f53186db..ad4d631c5bbf 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -162,22 +162,6 @@ private:
SdOptionsLayout maOptionsLayout;
};
-class SdOptionsContents : public SdOptionsGeneric
-{
-private:
-protected:
-
- virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
const override;
- virtual bool ReadData( const css::uno::Any* pValues ) override;
- virtual bool WriteData( css::uno::Any* pValues ) const override;
-
-public:
-
- SdOptionsContents(bool bImpress);
-
- bool operator==( const SdOptionsContents& rOpt ) const;
-};
-
class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
{
private:
@@ -559,7 +543,7 @@ private:
SdOptionsPrint maOptionsPrint;
};
-class SdOptions final : public SdOptionsLayout, public SdOptionsContents,
+class SdOptions final : public SdOptionsLayout,
public SdOptionsMisc, public SdOptionsSnap,
public SdOptionsZoom, public SdOptionsGrid,
public SdOptionsPrint
