summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/settings.hxx59
-rw-r--r--unusedcode.easy11
-rw-r--r--vcl/source/app/settings.cxx333
-rw-r--r--vcl/source/window/window.cxx9
-rw-r--r--vcl/win/source/window/salframe.cxx2
5 files changed, 11 insertions, 403 deletions
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 981c02fa4a8b..ba2aae2f43ec 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -95,37 +95,21 @@ public:
void SetStartDragHeight( long nDragHeight );
long GetStartDragHeight() const;
- void SetStartDragCode( sal_uInt16 nCode );
sal_uInt16 GetStartDragCode() const;
- void SetDragMoveCode( sal_uInt16 nCode );
- sal_uInt16 GetDragMoveCode() const;
-
- void SetDragCopyCode( sal_uInt16 nCode );
- sal_uInt16 GetDragCopyCode() const;
-
- void SetDragLinkCode( sal_uInt16 nCode );
- sal_uInt16 GetDragLinkCode() const;
-
- void SetContextMenuCode( sal_uInt16 nCode );
sal_uInt16 GetContextMenuCode() const;
- void SetContextMenuClicks( sal_uInt16 nClicks );
sal_uInt16 GetContextMenuClicks() const;
- void SetContextMenuDown( bool bDown );
bool GetContextMenuDown() const;
- void SetScrollRepeat( sal_uLong nRepeat );
sal_uLong GetScrollRepeat() const;
- void SetButtonStartRepeat( sal_uLong nRepeat );
sal_uLong GetButtonStartRepeat() const;
void SetButtonRepeat( sal_uLong nRepeat );
sal_uLong GetButtonRepeat() const;
- void SetActionDelay( sal_uLong nDelay );
sal_uLong GetActionDelay() const;
void SetMenuDelay( sal_uLong nDelay );
@@ -200,8 +184,6 @@ struct FrameStyle
| DRAGFULL_OPTION_DOCKING | DRAGFULL_OPTION_SPLIT \
| DRAGFULL_OPTION_SCROLL )
-#define LOGO_DISPLAYTIME_STARTTIME ((sal_uLong)0xFFFFFFFF)
-
#define SELECTION_OPTION_WORD ((sal_uLong)0x00000001)
#define SELECTION_OPTION_FOCUS ((sal_uLong)0x00000002)
#define SELECTION_OPTION_INVERT ((sal_uLong)0x00000004)
@@ -368,7 +350,6 @@ public:
void SetVisitedLinkColor( const Color& rColor );
const Color& GetVisitedLinkColor() const;
- void SetHighlightLinkColor( const Color& rColor );
const Color& GetHighlightLinkColor() const;
void SetMonoColor( const Color& rColor );
@@ -452,7 +433,6 @@ public:
void SetIconFont( const Font& rFont );
const Font& GetIconFont() const;
- void SetBorderSize( long nSize );
long GetBorderSize() const;
void SetTitleHeight( long nSize );
@@ -461,12 +441,8 @@ public:
void SetFloatTitleHeight( long nSize );
long GetFloatTitleHeight() const;
- void SetTearOffTitleHeight( long nSize );
long GetTearOffTitleHeight() const;
- void SetMenuBarHeight( long nSize );
- long GetMenuBarHeight() const;
-
void SetScrollBarSize( long nSize );
long GetScrollBarSize() const;
@@ -476,15 +452,8 @@ public:
void SetSpinSize( long nSize );
long GetSpinSize() const;
- void SetSplitSize( long nSize );
long GetSplitSize() const;
- void SetIconHorzSpace( long nSpace );
- long GetIconHorzSpace() const;
-
- void SetIconVertSpace( long nSpace );
- long GetIconVertSpace() const;
-
void SetCursorSize( long nSize );
long GetCursorSize() const;
@@ -497,15 +466,9 @@ public:
void SetScreenFontZoom( sal_uInt16 nPercent );
sal_uInt16 GetScreenFontZoom() const;
- void SetLogoDisplayTime( sal_uLong nDisplayTime );
- sal_uLong GetLogoDisplayTime() const;
-
void SetDragFullOptions( sal_uLong nOptions );
sal_uLong GetDragFullOptions() const;
- void SetAnimationOptions( sal_uLong nOptions );
- sal_uLong GetAnimationOptions() const;
-
void SetSelectionOptions( sal_uLong nOptions );
sal_uLong GetSelectionOptions() const;
@@ -554,9 +517,6 @@ public:
*/
void SetPreferredIconTheme(const OUString&);
- const Wallpaper& GetWorkspaceGradient() const;
- void SetWorkspaceGradient( const Wallpaper& rWall );
-
const DialogStyle& GetDialogStyle() const;
void SetDialogStyle( const DialogStyle& rStyle );
@@ -572,9 +532,7 @@ public:
// TopLeft (default RGB_COLORDATA(0xC0, 0xC0, 0xC0)) and BottomRight (default RGB_COLORDATA(0x40, 0x40, 0x40))
// default colors for EdgeBlending
- void SetEdgeBlendingTopLeftColor(const Color& rTopLeft);
const Color& GetEdgeBlendingTopLeftColor() const;
- void SetEdgeBlendingBottomRightColor(const Color& rBottomRight);
const Color& GetEdgeBlendingBottomRightColor() const;
// maximum line count for ListBox control; to use this, call AdaptDropDownLineCountToMaximum() at the
@@ -591,21 +549,11 @@ public:
// maximum row/line count for the ColorValueSet control. If more lines would be needed, a scrollbar will
// be used. Default is 40.
- void SetColorValueSetMaximumRowCount(sal_uInt16 nCount);
sal_uInt16 GetColorValueSetMaximumRowCount() const;
- // the logical size for preview graphics in the ListBoxes (e.g. FillColor, FillGradient, FillHatch, FillGraphic, ..). The
- // default defines a UI-Scale independent setting which will be scaled using MAP_APPFONT. This ensures that the size will
- // fit independent from the used SystemFont (as all the ressources for UI elements). The default is Size(15, 7) which gives
- // the correct height and a decent width. Do not change the height, but you may adapt the width to change the preview width.
- // GetListBoxPreviewDefaultPixelSize() is for convenience so that not everyone has to do the scaling itself and contains
- // the logical size scaled by MAP_APPFONT.
- void SetListBoxPreviewDefaultLogicSize(const Size& rSize);
- const Size& GetListBoxPreviewDefaultLogicSize() const;
const Size& GetListBoxPreviewDefaultPixelSize() const;
// the default LineWidth for ListBox UI previews (LineStyle, LineDash, LineStartEnd). Default is 1.
- void SetListBoxPreviewDefaultLineWidth(sal_uInt16 nWidth);
sal_uInt16 GetListBoxPreviewDefaultLineWidth() const;
// defines if previews which containn potentially transparent objects (e.g. the dash/line/LineStartEnd previews and others)
@@ -660,13 +608,9 @@ public:
HelpSettings();
~HelpSettings();
- void SetOptions( sal_uLong nOptions );
- sal_uLong GetOptions() const;
- void SetTipDelay( sal_uLong nTipDelay );
sal_uLong GetTipDelay() const;
void SetTipTimeout( sal_uLong nTipTimeout );
sal_uLong GetTipTimeout() const;
- void SetBalloonDelay( sal_uLong nBalloonDelay );
sal_uLong GetBalloonDelay() const;
bool operator ==( const HelpSettings& rSet ) const;
@@ -729,9 +673,6 @@ public:
const vcl::I18nHelper& GetLocaleI18nHelper() const;
const vcl::I18nHelper& GetUILocaleI18nHelper() const;
- void SetSystemUpdate( sal_uLong nUpdate );
- sal_uLong GetSystemUpdate() const;
- void SetWindowUpdate( sal_uLong nUpdate );
sal_uLong GetWindowUpdate() const;
sal_uLong Update( sal_uLong nFlags, const AllSettings& rSettings );
diff --git a/unusedcode.easy b/unusedcode.easy
index 495c4ec94427..c3a47d03b478 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -8,6 +8,8 @@ CodeCompleteDataCache::SetVars(boost::unordered::unordered_map<rtl::OUString, bo
CodeCompleteDataCache::print() const
ComboBox::GetMRUCount() const
ConfigurationAccess::getPath(rtl::OUString const&)
+DocxSdrExport::getFlyFrameGraphic()
+DocxSdrExport::setFlyFrameGraphic(bool)
DocxSdrExport::setFrameBtLr(bool)
EditEngine::IsIdleFormatterActive() const
EditSelection::IsInvalid() const
@@ -75,6 +77,14 @@ SimpleErrorHandler::SimpleErrorHandler()
SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
SotFactory::Find(SvGlobalName const&)
+StyleSettings::SetActiveColor2(Color const&)
+StyleSettings::SetDeactiveColor2(Color const&)
+StyleSettings::SetFloatTitleHeight(long)
+StyleSettings::SetHideDisabledMenuItems(bool)
+StyleSettings::SetSpinSize(long)
+StyleSettings::SetTitleHeight(long)
+StyleSettings::SetUseFlatBorders(bool)
+StyleSettings::SetUseFlatMenus(bool)
SvdProgressInfo::ReportError()
SvpSalInstance::PostedEventsInQueue()
SvtAccessibilityOptions::GetColorValueSetColumnCount() const
@@ -286,6 +296,7 @@ sdr::table::Cell::getName()
sdr::table::SdrTableObj::getRowCount() const
sfx2::sidebar::ContextList::IsEmpty()
sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*, std::allocator<sfx2::sidebar::Panel*> > const&)
+sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext const&) const
sfx2::sidebar::EnumContext::GetContext() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 68314006da6f..b5b3b6005fe5 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -66,9 +66,6 @@ struct ImplMouseData
long mnStartDragWidth;
long mnStartDragHeight;
sal_uInt16 mnStartDragCode;
- sal_uInt16 mnDragMoveCode;
- sal_uInt16 mnDragCopyCode;
- sal_uInt16 mnDragLinkCode;
sal_uInt16 mnContextMenuCode;
sal_uInt16 mnContextMenuClicks;
bool mbContextMenuDown;
@@ -160,15 +157,10 @@ struct ImplStyleData
long mnSplitSize;
long mnSpinSize;
long mnCursorSize;
- long mnMenuBarHeight;
- long mnIconHorzSpace;
- long mnIconVertSpace;
long mnAntialiasedMin;
sal_uLong mnCursorBlinkTime;
sal_uLong mnDragFullOptions;
- sal_uLong mnAnimationOptions;
sal_uLong mnSelectionOptions;
- sal_uLong mnLogoDisplayTime;
sal_uLong mnDisplayOptions;
sal_uLong mnToolbarIconSize;
bool mnUseFlatMenus;
@@ -194,7 +186,6 @@ struct ImplStyleData
//mbPrimaryButtonWarpsSlider == true for "jump to here" behavior for primary button, otherwise
//primary means scroll by single page. Secondary button takes the alternative behaviour
bool mbPrimaryButtonWarpsSlider;
- Wallpaper maWorkspaceGradient;
DialogStyle maDialogStyle;
FrameStyle maFrameStyle;
const void* mpFontOptions;
@@ -249,7 +240,6 @@ struct ImplAllSettingsData
MiscSettings maMiscSettings;
HelpSettings maHelpSettings;
LanguageTag maLocale;
- sal_uLong mnSystemUpdate;
sal_uLong mnWindowUpdate;
LanguageTag maUILocale;
LocaleDataWrapper* mpLocaleDataWrapper;
@@ -268,9 +258,6 @@ ImplMouseData::ImplMouseData()
mnStartDragWidth = 2;
mnStartDragHeight = 2;
mnStartDragCode = MOUSE_LEFT;
- mnDragMoveCode = 0;
- mnDragCopyCode = KEY_MOD1;
- mnDragLinkCode = KEY_SHIFT | KEY_MOD1;
mnContextMenuCode = MOUSE_RIGHT;
mnContextMenuClicks = 1;
mbContextMenuDown = true;
@@ -293,9 +280,6 @@ ImplMouseData::ImplMouseData( const ImplMouseData& rData )
mnStartDragWidth = rData.mnStartDragWidth;
mnStartDragHeight = rData.mnStartDragHeight;
mnStartDragCode = rData.mnStartDragCode;
- mnDragMoveCode = rData.mnDragMoveCode;
- mnDragCopyCode = rData.mnDragCopyCode;
- mnDragLinkCode = rData.mnDragLinkCode;
mnContextMenuCode = rData.mnContextMenuCode;
mnContextMenuClicks = rData.mnContextMenuClicks;
mbContextMenuDown = rData.mbContextMenuDown;
@@ -387,117 +371,36 @@ MouseSettings::GetStartDragHeight() const
return mpData->mnStartDragHeight;
}
-
-void
-MouseSettings::SetStartDragCode( sal_uInt16 nCode )
-{
- CopyData(); mpData->mnStartDragCode = nCode;
-}
-
sal_uInt16
MouseSettings::GetStartDragCode() const
{
return mpData->mnStartDragCode;
}
-void
-MouseSettings::SetDragMoveCode( sal_uInt16 nCode )
-{
- CopyData();
- mpData->mnDragMoveCode = nCode;
-}
-
-sal_uInt16
-MouseSettings::GetDragMoveCode() const
-{
- return mpData->mnDragMoveCode;
-}
-
-void
-MouseSettings::SetDragCopyCode( sal_uInt16 nCode )
-{
- CopyData();
- mpData->mnDragCopyCode = nCode;
-}
-
-sal_uInt16
-MouseSettings::GetDragCopyCode() const
-{
- return mpData->mnDragCopyCode;
-}
-
-void
-MouseSettings::SetDragLinkCode( sal_uInt16 nCode )
-{
- CopyData();
- mpData->mnDragLinkCode = nCode;
-}
-
-sal_uInt16
-MouseSettings::GetDragLinkCode() const
-{
- return mpData->mnDragLinkCode;
-}
-
-void
-MouseSettings::SetContextMenuCode( sal_uInt16 nCode )
-{
- CopyData();
- mpData->mnContextMenuCode = nCode;
-}
-
sal_uInt16
MouseSettings::GetContextMenuCode() const
{
return mpData->mnContextMenuCode;
}
-void
-MouseSettings::SetContextMenuClicks( sal_uInt16 nClicks )
-{
- CopyData();
- mpData->mnContextMenuClicks = nClicks;
-}
-
sal_uInt16
MouseSettings::GetContextMenuClicks() const
{
return mpData->mnContextMenuClicks;
}
-void
-MouseSettings::SetContextMenuDown( bool bDown )
-{
- CopyData();
- mpData->mbContextMenuDown = bDown;
-}
-
bool
MouseSettings::GetContextMenuDown() const
{
return mpData->mbContextMenuDown;
}
-void
-MouseSettings::SetScrollRepeat( sal_uLong nRepeat )
-{
- CopyData();
- mpData->mnScrollRepeat = nRepeat;
-}
-
sal_uLong
MouseSettings::GetScrollRepeat() const
{
return mpData->mnScrollRepeat;
}
-void
-MouseSettings::SetButtonStartRepeat( sal_uLong nRepeat )
-{
- CopyData();
- mpData->mnButtonStartRepeat = nRepeat;
-}
-
sal_uLong
MouseSettings::GetButtonStartRepeat() const
{
@@ -517,13 +420,6 @@ MouseSettings::GetButtonRepeat() const
return mpData->mnButtonRepeat;
}
-void
-MouseSettings::SetActionDelay( sal_uLong nDelay )
-{
- CopyData();
- mpData->mnActionDelay = nDelay;
-}
-
sal_uLong
MouseSettings::GetActionDelay() const
{
@@ -621,9 +517,6 @@ bool MouseSettings::operator ==( const MouseSettings& rSet ) const
(mpData->mnStartDragWidth == rSet.mpData->mnStartDragWidth) &&
(mpData->mnStartDragHeight == rSet.mpData->mnStartDragHeight) &&
(mpData->mnStartDragCode == rSet.mpData->mnStartDragCode) &&
- (mpData->mnDragMoveCode == rSet.mpData->mnDragMoveCode) &&
- (mpData->mnDragCopyCode == rSet.mpData->mnDragCopyCode) &&
- (mpData->mnDragLinkCode == rSet.mpData->mnDragLinkCode) &&
(mpData->mnContextMenuCode == rSet.mpData->mnContextMenuCode) &&
(mpData->mnContextMenuClicks == rSet.mpData->mnContextMenuClicks) &&
(mpData->mbContextMenuDown == rSet.mpData->mbContextMenuDown) &&
@@ -651,16 +544,12 @@ ImplStyleData::ImplStyleData() :
mnMinThumbSize = 16;
mnSplitSize = 3;
mnSpinSize = 16;
- mnIconHorzSpace = 50;
- mnIconVertSpace = 40;
mnAntialiasedMin = 0;
mnCursorSize = 2;
mnCursorBlinkTime = STYLE_CURSOR_NOBLINKTIME;
mnScreenZoom = 100;
mnScreenFontZoom = 100;
- mnLogoDisplayTime = LOGO_DISPLAYTIME_STARTTIME;
mnDragFullOptions = DRAGFULL_OPTION_ALL;
- mnAnimationOptions = 0;
mnSelectionOptions = 0;
mnDisplayOptions = 0;
mnOptions = 0;
@@ -746,7 +635,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maIconFont( rData.maIconFont ),
maGroupFont( rData.maGroupFont ),
mIconTheme(rData.mIconTheme),
- maWorkspaceGradient( rData.maWorkspaceGradient ),
maDialogStyle( rData.maDialogStyle ),
maFrameStyle( rData.maFrameStyle ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
@@ -757,21 +645,16 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
mnTitleHeight = rData.mnTitleHeight;
mnFloatTitleHeight = rData.mnFloatTitleHeight;
mnTearOffTitleHeight = rData.mnTearOffTitleHeight;
- mnMenuBarHeight = rData.mnMenuBarHeight;
mnScrollBarSize = rData.mnScrollBarSize;
mnMinThumbSize = rData.mnMinThumbSize;
mnSplitSize = rData.mnSplitSize;
mnSpinSize = rData.mnSpinSize;
- mnIconHorzSpace = rData.mnIconHorzSpace;
- mnIconVertSpace = rData.mnIconVertSpace;
mnAntialiasedMin = rData.mnAntialiasedMin;
mnCursorSize = rData.mnCursorSize;
mnCursorBlinkTime = rData.mnCursorBlinkTime;
mnScreenZoom = rData.mnScreenZoom;
mnScreenFontZoom = rData.mnScreenFontZoom;
- mnLogoDisplayTime = rData.mnLogoDisplayTime;
mnDragFullOptions = rData.mnDragFullOptions;
- mnAnimationOptions = rData.mnAnimationOptions;
mnSelectionOptions = rData.mnSelectionOptions;
mnDisplayOptions = rData.mnDisplayOptions;
mnOptions = rData.mnOptions;
@@ -877,7 +760,6 @@ void ImplStyleData::SetStandardStyles()
mnTitleHeight = 18;
mnFloatTitleHeight = 13;
mnTearOffTitleHeight = 8;
- mnMenuBarHeight = 14;
mbHighContrast = false;
mbUseSystemUIFonts = true;
mnUseFlatBorders = false;
@@ -887,9 +769,6 @@ void ImplStyleData::SetStandardStyles()
mbHideDisabledMenuItems = false;
mbAcceleratorsInContextMenus = true;
mbPrimaryButtonWarpsSlider = false;
-
- Gradient aGrad( GradientStyle_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
- maWorkspaceGradient = Wallpaper( aGrad );
}
StyleSettings::StyleSettings()
@@ -1473,20 +1352,12 @@ StyleSettings::GetVisitedLinkColor() const
return mpData->maVisitedLinkColor;
}
-void
-StyleSettings::SetHighlightLinkColor( const Color& rColor )
-{
- CopyData();
- mpData->maHighlightLinkColor = rColor;
-}
-
const Color&
StyleSettings::GetHighlightLinkColor() const
{
return mpData->maHighlightLinkColor;
}
-
void
StyleSettings::SetMonoColor( const Color& rColor )
{
@@ -1822,14 +1693,6 @@ StyleSettings::GetIconFont() const
return mpData->maIconFont;
}
-
-void
-StyleSettings::SetBorderSize( long nSize )
-{
- CopyData();
- mpData->mnBorderSize = nSize;
-}
-
long
StyleSettings::GetBorderSize() const
{
@@ -1862,13 +1725,6 @@ StyleSettings::GetFloatTitleHeight() const
return mpData->mnFloatTitleHeight;
}
-void
-StyleSettings::SetTearOffTitleHeight( long nSize )
-{
- CopyData();
- mpData->mnTearOffTitleHeight = nSize;
-}
-
long
StyleSettings::GetTearOffTitleHeight() const
{
@@ -1876,19 +1732,6 @@ StyleSettings::GetTearOffTitleHeight() const
}
void
-StyleSettings::SetMenuBarHeight( long nSize )
-{
- CopyData();
- mpData->mnMenuBarHeight = nSize;
-}
-
-long
-StyleSettings::GetMenuBarHeight() const
-{
- return mpData->mnMenuBarHeight;
-}
-
-void
StyleSettings::SetScrollBarSize( long nSize )
{
CopyData();
@@ -1927,47 +1770,12 @@ StyleSettings::GetSpinSize() const
return mpData->mnSpinSize;
}
-void
-StyleSettings::SetSplitSize( long nSize )
-{
- CopyData();
- mpData->mnSplitSize = nSize;
-}
-
long
StyleSettings::GetSplitSize() const
{
return mpData->mnSplitSize;
}
-
-void
-StyleSettings::SetIconHorzSpace( long nSpace )
-{
- CopyData();
- mpData->mnIconHorzSpace = nSpace;
-}
-
-long
-StyleSettings::GetIconHorzSpace() const
-{
- return mpData->mnIconHorzSpace;
-}
-
-void
-StyleSettings::SetIconVertSpace( long nSpace )
-{
- CopyData();
- mpData->mnIconVertSpace = nSpace;
-}
-
-long
-StyleSettings::GetIconVertSpace() const
-{
- return mpData->mnIconVertSpace;
-}
-
-
void
StyleSettings::SetCursorSize( long nSize )
{
@@ -2021,21 +1829,6 @@ StyleSettings::GetScreenFontZoom() const
return mpData->mnScreenFontZoom;
}
-
-void
-StyleSettings::SetLogoDisplayTime( sal_uLong nDisplayTime )
-{
- CopyData();
- mpData->mnLogoDisplayTime = nDisplayTime;
-}
-
-sal_uLong
-StyleSettings::GetLogoDisplayTime() const
-{
- return mpData->mnLogoDisplayTime;
-}
-
-
void
StyleSettings::SetDragFullOptions( sal_uLong nOptions )
{
@@ -2049,21 +1842,6 @@ StyleSettings::GetDragFullOptions() const
return mpData->mnDragFullOptions;
}
-
-void
-StyleSettings::SetAnimationOptions( sal_uLong nOptions )
-{
- CopyData();
- mpData->mnAnimationOptions = nOptions;
-}
-
-sal_uLong
-StyleSettings::GetAnimationOptions() const
-{
- return mpData->mnAnimationOptions;
-}
-
-
void
StyleSettings::SetSelectionOptions( sal_uLong nOptions )
{
@@ -2153,20 +1931,6 @@ StyleSettings::GetToolbarIconSize() const
return mpData->mnToolbarIconSize;
}
-const Wallpaper&
-StyleSettings::GetWorkspaceGradient() const
-{
- return mpData->maWorkspaceGradient;
-}
-
-void
-StyleSettings::SetWorkspaceGradient( const Wallpaper& rWall )
-{
- CopyData();
- mpData->maWorkspaceGradient = rWall;
-}
-
-
const DialogStyle&
StyleSettings::GetDialogStyle() const
{
@@ -2207,26 +1971,12 @@ StyleSettings::GetEdgeBlending() const
return mpData->mnEdgeBlending;
}
-void
-StyleSettings::SetEdgeBlendingTopLeftColor(const Color& rTopLeft)
-{
- CopyData();
- mpData->maEdgeBlendingTopLeftColor = rTopLeft;
-}
-
const Color&
StyleSettings::GetEdgeBlendingTopLeftColor() const
{
return mpData->maEdgeBlendingTopLeftColor;
}
-void
-StyleSettings::SetEdgeBlendingBottomRightColor(const Color& rBottomRight)
-{
- CopyData();
- mpData->maEdgeBlendingBottomRightColor = rBottomRight;
-}
-
const Color&
StyleSettings::GetEdgeBlendingBottomRightColor() const
{
@@ -2259,39 +2009,12 @@ StyleSettings::GetColorValueSetColumnCount() const
return mpData->mnColorValueSetColumnCount;
}
-void
-StyleSettings::SetColorValueSetMaximumRowCount(sal_uInt16 nCount)
-{
- CopyData();
- mpData->mnColorValueSetMaximumRowCount = nCount;
-}
-
sal_uInt16
StyleSettings::GetColorValueSetMaximumRowCount() const
{
return mpData->mnColorValueSetMaximumRowCount;
}
-void
-StyleSettings::SetListBoxPreviewDefaultLogicSize(const Size& rSize)
-{
- CopyData();
- mpData->maListBoxPreviewDefaultLogicSize = rSize; mpData->maListBoxPreviewDefaultPixelSize = Size(0, 0);
-}
-
-const Size&
-StyleSettings::GetListBoxPreviewDefaultLogicSize() const
-{
- return mpData->maListBoxPreviewDefaultLogicSize;
-}
-
-void
-StyleSettings::SetListBoxPreviewDefaultLineWidth(sal_uInt16 nWidth)
-{
- CopyData();
- mpData->mnListBoxPreviewDefaultLineWidth = nWidth;
-}
-
sal_uInt16
StyleSettings::GetListBoxPreviewDefaultLineWidth() const
{
@@ -2528,9 +2251,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
if ( (mpData->mnOptions == rSet.mpData->mnOptions) &&
(mpData->mbAutoMnemonic == rSet.mpData->mbAutoMnemonic) &&
- (mpData->mnLogoDisplayTime == rSet.mpData->mnLogoDisplayTime) &&
(mpData->mnDragFullOptions == rSet.mpData->mnDragFullOptions) &&
- (mpData->mnAnimationOptions == rSet.mpData->mnAnimationOptions) &&
(mpData->mnSelectionOptions == rSet.mpData->mnSelectionOptions) &&
(mpData->mnDisplayOptions == rSet.mpData->mnDisplayOptions) &&
(mpData->mnCursorSize == rSet.mpData->mnCursorSize) &&
@@ -2539,13 +2260,10 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
(mpData->mnTitleHeight == rSet.mpData->mnTitleHeight) &&
(mpData->mnFloatTitleHeight == rSet.mpData->mnFloatTitleHeight) &&
(mpData->mnTearOffTitleHeight == rSet.mpData->mnTearOffTitleHeight) &&
- (mpData->mnMenuBarHeight == rSet.mpData->mnMenuBarHeight) &&
(mpData->mnScrollBarSize == rSet.mpData->mnScrollBarSize) &&
(mpData->mnMinThumbSize == rSet.mpData->mnMinThumbSize) &&
(mpData->mnSplitSize == rSet.mpData->mnSplitSize) &&
(mpData->mnSpinSize == rSet.mpData->mnSpinSize) &&
- (mpData->mnIconHorzSpace == rSet.mpData->mnIconHorzSpace) &&
- (mpData->mnIconVertSpace == rSet.mpData->mnIconVertSpace) &&
(mpData->mnAntialiasedMin == rSet.mpData->mnAntialiasedMin) &&
(mpData->mnScreenZoom == rSet.mpData->mnScreenZoom) &&
(mpData->mnScreenFontZoom == rSet.mpData->mnScreenFontZoom) &&
@@ -2836,7 +2554,6 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const
ImplHelpData::ImplHelpData()
{
- mnOptions = 0;
mnTipDelay = 500;
mnTipTimeout = 3000;
mnBalloonDelay = 1500;
@@ -2844,7 +2561,6 @@ ImplHelpData::ImplHelpData()
ImplHelpData::ImplHelpData( const ImplHelpData& rData )
{
- mnOptions = rData.mnOptions;
mnTipDelay = rData.mnTipDelay;
mnTipTimeout = rData.mnTipTimeout;
mnBalloonDelay = rData.mnBalloonDelay;
@@ -2881,26 +2597,6 @@ bool HelpSettings::operator ==( const HelpSettings& rSet ) const
return false;
}
-void
-HelpSettings::SetOptions( sal_uLong nOptions )
-{
- CopyData();
- mpData->mnOptions = nOptions;
-}
-
-sal_uLong
-HelpSettings::GetOptions() const
-{
- return mpData->mnOptions;
-}
-
-void
-HelpSettings::SetTipDelay( sal_uLong nTipDelay )
-{
- CopyData();
- mpData->mnTipDelay = nTipDelay;
-}
-
sal_uLong
HelpSettings::GetTipDelay() const
{
@@ -2920,13 +2616,6 @@ HelpSettings::GetTipTimeout() const
return mpData->mnTipTimeout;
}
-void
-HelpSettings::SetBalloonDelay( sal_uLong nBalloonDelay )
-{
- CopyData();
- mpData->mnBalloonDelay = nBalloonDelay;
-}
-
sal_uLong
HelpSettings::GetBalloonDelay() const
{
@@ -2944,7 +2633,6 @@ ImplAllSettingsData::ImplAllSettingsData()
maLocale( LANGUAGE_SYSTEM ),
maUILocale( LANGUAGE_SYSTEM )
{
- mnSystemUpdate = SETTINGS_ALLSETTINGS;
mnWindowUpdate = SETTINGS_ALLSETTINGS;
mpLocaleDataWrapper = NULL;
mpUILocaleDataWrapper = NULL;
@@ -2961,7 +2649,6 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
maLocale( rData.maLocale ),
maUILocale( rData.maUILocale )
{
- mnSystemUpdate = rData.mnSystemUpdate;
mnWindowUpdate = rData.mnWindowUpdate;
// Pointer couldn't shared and objects haven't a copy ctor
// So we create the cache objects new, if the GetFunction is
@@ -3100,7 +2787,6 @@ bool AllSettings::operator ==( const AllSettings& rSet ) const
(mpData->maStyleSettings == rSet.mpData->maStyleSettings) &&
(mpData->maMiscSettings == rSet.mpData->maMiscSettings) &&
(mpData->maHelpSettings == rSet.mpData->maHelpSettings) &&
- (mpData->mnSystemUpdate == rSet.mpData->mnSystemUpdate) &&
(mpData->maLocale == rSet.mpData->maLocale) &&
(mpData->mnWindowUpdate == rSet.mpData->mnWindowUpdate) )
{
@@ -3383,25 +3069,6 @@ AllSettings::GetHelpSettings() const
return mpData->maHelpSettings;
}
-void
-AllSettings::SetSystemUpdate( sal_uLong nUpdate )
-{
- CopyData();
- mpData->mnSystemUpdate = nUpdate;
-}
-
-sal_uLong
-AllSettings::GetSystemUpdate() const
-{
- return mpData->mnSystemUpdate;
-}
-
-void
-AllSettings::SetWindowUpdate( sal_uLong nUpdate )
-{
- CopyData();
- mpData->mnWindowUpdate = nUpdate;
-}
sal_uLong
AllSettings::GetWindowUpdate() const
{
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 557de5b0a070..5eb217c7737e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -618,15 +618,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
aFont.SetHeight( defFontheight );
aStyleSettings.SetGroupFont( aFont );
- // set workspace gradient to black in dark themes
- if( aStyleSettings.GetWindowColor().IsDark() )
- aStyleSettings.SetWorkspaceGradient( Wallpaper( Color( COL_BLACK ) ) );
- else
- {
- Gradient aGrad( GradientStyle_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
- aStyleSettings.SetWorkspaceGradient( Wallpaper( aGrad ) );
- }
-
rSettings.SetStyleSettings( aStyleSettings );
bool bForceHCMode = false;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index e6ab38a3eaa5..850faf7f94e5 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2938,8 +2938,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetDragFullOptions( nDragFullOptions );
}
- aStyleSettings.SetIconHorzSpace( GetSystemMetrics( SM_CXICONSPACING ) );
- aStyleSettings.SetIconVertSpace( GetSystemMetrics( SM_CYICONSPACING ) );
if ( RegOpenKey( HKEY_CURRENT_USER,
"Control Panel\\International\\Calendars\\TwoDigitYearMax",
&hRegKey ) == ERROR_SUCCESS )
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-18 00:39:54 +0000