[Libreoffice-commits] core.git: svtools/source vcl/source

[Julien Nabet (via logerrit)]

 svtools/source/svrtf/svparser.cxx |6 +++---
 vcl/source/font/font.cxx  |2 +-
 vcl/source/gdi/dibtools.cxx   |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 70666469b87ab1e3589db0f5f7a236d744e83733
Author: Julien Nabet 
AuthorDate: Fri Sep 11 17:38:21 2020 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 12 18:54:15 2020 +0200

Replace remaining uses of sal_uChar

The goal is then to remove sal_uChar completely since it's been deprecated 
in 2013!
See 
http://document-foundation-mail-archive.969070.n3.nabble.com/About-removing-long-time-deprecated-types-from-public-API-tt4287268.html

Change-Id: I1ed6a56075a47fbfeac97388432bffcbd2ef1f7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102491
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index cafb5b8d38e5..429e9e045f91 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -286,7 +286,7 @@ sal_uInt32 SvParser::GetNextChar()
)
 {
 // no conversion shall take place
-c = reinterpret_cast( c1 );
+c = reinterpret_cast( c1 );
 nChars = 1;
 }
 else
@@ -390,7 +390,7 @@ sal_uInt32 SvParser::GetNextChar()
 
 // There are still errors, so we use the 
first
 // character and restart after that.
-c = reinterpret_cast( 
sBuffer[0] );
+c = reinterpret_cast( 
sBuffer[0] );
 rInput.SeekRel( -(nLen-1) );
 nChars = 1;
 }
@@ -412,7 +412,7 @@ sal_uInt32 SvParser::GetNextChar()
 "there is no converted character and no error" 
);
 // #73398#: If the character could not be converted,
 // because a conversion is not available, do no 
conversion at all.
-c = reinterpret_cast( c1 );
+c = reinterpret_cast( c1 );
 nChars = 1;
 
 }
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 046816510087..18f1aa0cd939 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -431,7 +431,7 @@ SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& 
rImplFont )
 rOStm.WriteUChar( static_cast(rImplFont.meKerning) );
 
 // new in version 2
-rOStm.WriteUChar( static_cast(rImplFont.meRelief) );
+rOStm.WriteUChar( static_cast(rImplFont.meRelief) );
 rOStm.WriteUInt16( 
static_cast(rImplFont.maCJKLanguageTag.getLanguageType( false)) );
 rOStm.WriteBool( rImplFont.mbVertical );
 rOStm.WriteUInt16( static_cast(rImplFont.meEmphasisMark) );
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index f2164b94d129..df91ad1659e5 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1879,7 +1879,7 @@ bool WriteDIBBitmapEx(
 {
 rOStm.WriteUInt32( 0x25091962 );
 rOStm.WriteUInt32( 0xACB20201 );
-rOStm.WriteUChar( static_cast(rSource.meTransparent) );
+rOStm.WriteUChar( static_cast(rSource.meTransparent) );
 
 if(TransparentType::Bitmap == rSource.meTransparent)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Tor Lillqvist (via logerrit)]

 svtools/source/config/accessibilityoptions.cxx |4 
 vcl/source/app/settings.cxx|9 -
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6c3f6fc13a9d6d112253f895d45ea4c9aaab6607
Author: Tor Lillqvist 
AuthorDate: Fri Dec 20 17:32:25 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Sat Dec 21 05:03:56 2019 +0200

tdf#126966: Make the colour swatches larger on iOS

We reduce the number of swatches per row from 12 to 4 and increase
their size suitably so that the thing still fits in the sidebar in the
iOS app on an iPad in portrait orientation.

Change-Id: Ie81e5b54e88a02c6866de27448b5be72e97d9a16
Reviewed-on: https://gerrit.libreoffice.org/85620
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 18af8dc6a038d1e76274de7abc55ffa06b39a6c8)

diff --git a/svtools/source/config/accessibilityoptions.cxx 
b/svtools/source/config/accessibilityoptions.cxx
index 6cd499a08e6d..315a0333b7b7 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -261,6 +261,9 @@ sal_Int16 
SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
 
 sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
 {
+#ifdef IOS
+return 4;
+#else
 css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, 
css::uno::UNO_QUERY);
 sal_Int16 nRet = 12;
 
@@ -275,6 +278,7 @@ sal_Int16 
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
 }
 
 return nRet;
+#endif
 }
 
 bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bf50a8150d47..900dd98d34ff 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -472,8 +472,15 @@ ImplStyleData::ImplStyleData() :
 maEdgeBlendingTopLeftColor(Color(0xC0, 0xC0, 0xC0)),
 maEdgeBlendingBottomRightColor(Color(0x40, 0x40, 0x40)),
 mnListBoxMaximumLineCount(25),
+// For some reason this isn't actually the column count that gets used, at 
least on iOS, but
+// instead what 
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() in
+// svtools/source/config/accessibilityoptions.cxx returns.
 mnColorValueSetColumnCount(12),
+#ifdef IOS
+maListBoxPreviewDefaultLogicSize(Size(30, 30)),
+#else
 maListBoxPreviewDefaultLogicSize(Size(15, 7)),
+#endif
 maListBoxPreviewDefaultPixelSize(Size(0, 0)), // on-demand calculated in 
GetListBoxPreviewDefaultPixelSize(),
 mbPreviewUsesCheckeredBackground(true)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Miklos Vajna (via logerrit)]

 svtools/source/control/valueset.cxx |3 ++-
 vcl/source/window/paint.cxx |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 35132e5cd648fd54ffb186039324f5fb954dd08f
Author: Miklos Vajna 
AuthorDate: Thu Aug 29 18:01:44 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 29 18:44:42 2019 +0200

tdf#127211 start center: fix background of the main area with no recent docs

The background was white instead of gray, but the text color remained
white, making the text unreadable. This was a problem since commit
a5cafe5d7e87c0f5ecdcffbbe58c66abcb97ac8e (tdf#91843 sd sidebar: fix
unexpected borders around the slide layout previews, 2019-08-27).

Given that the background fix was intended to help with the slide
previews in impress, move the change affecting the background handling
down to ValueSet and revert the VCL changes.

This preserves the impress slide preview fix, but restores the old good
behavior for all non-ValueSet widgets, including the start center.

Change-Id: I7efcd5b9c12e5df8e10261c992bf7a774960fa11
Reviewed-on: https://gerrit.libreoffice.org/78280
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 79e861fca94c..87383a67df9e 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -149,7 +149,8 @@ void ValueSet::ApplySettings(vcl::RenderContext& 
rRenderContext)
 aColor = rStyleSettings.GetWindowColor();
 else
 aColor = rStyleSettings.GetFaceColor();
-ApplyControlBackground(rRenderContext, aColor);
+if (GetBackground().GetColor() == COL_TRANSPARENT)
+ApplyControlBackground(rRenderContext, aColor);
 }
 
 void ValueSet::ImplInitSettings(bool bFont, bool bForeground, bool bBackground)
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 1804004137c3..d8703a4c5b0f 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -298,8 +298,8 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 // direct painting
 Wallpaper aBackground = m_pWindow->GetBackground();
 m_pWindow->ApplySettings(*m_pWindow);
-// Restore lost bitmap or solid color background.
-if (aBackground.IsBitmap() || aBackground.GetColor() != 
COL_TRANSPARENT)
+// Restore lost bitmap background.
+if (aBackground.IsBitmap())
 m_pWindow->SetBackground(aBackground);
 m_pWindow->PushPaintHelper(this, *m_pWindow);
 m_pWindow->Paint(*m_pWindow, m_aPaintRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Libreoffice Gerrit user]

 svtools/source/control/valueset.cxx |2 +-
 vcl/source/app/salvtables.cxx   |   24 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 9c3faeae633f0c1efea199e522d2413461b16345
Author: Caolán McNamara 
AuthorDate: Mon Jan 14 21:05:41 2019 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 15 09:52:47 2019 +0100

Resolves: tdf#122656 keypress handled twice

Change-Id: I8a9ec82d46a3df04554c139264755c8f28f5e897
Reviewed-on: https://gerrit.libreoffice.org/66335
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index a422048583c4..5b7ca0504d05 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2545,7 +2545,7 @@ bool SvtValueSet::KeyInput( const KeyEvent& rKeyEvent )
 }
 
 if ( nItemPos == VALUESET_ITEM_NOTFOUND )
-return false;
+return true;
 
 if ( nItemPos!=VALUESET_ITEM_NONEITEM && nItemPoshttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Libreoffice Gerrit user]

 svtools/source/control/ctrlbox.cxx |1 +
 vcl/source/control/edit.cxx|8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9b0e098a785165cd9ec28c60505b60e62c3e59dc
Author: Nickson 
AuthorDate: Wed Sep 19 23:13:56 2018 +0100
Commit: Heiko Tietze 
CommitDate: Thu Oct 18 11:24:38 2018 +0200

tdf#119847 - Can now autoselect font size on first click

Change-Id: Id49f4d039f0eb7c4efccecda91bd656c1c31d497
Reviewed-on: https://gerrit.libreoffice.org/60784
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 4044ad61da84..bad8ecee665d 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1242,6 +1242,7 @@ void SvtFontStyleBox::Fill( const OUString& rName, const 
FontList* pList )
 FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) :
 MetricBox( pParent, nWinSize )
 {
+EnableSelectAll();
 ImplInit();
 }
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 3688f9c3374d..895d35cef5e7 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1310,7 +1310,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
 if ( rMEvt.GetClicks() < 4 )
 {
 mbClickedInSelection = false;
-if ( rMEvt.GetClicks() == 3 || mbSelectAllSingleClick )
+if ( rMEvt.GetClicks() == 3 )
 {
 ImplSetSelection( Selection( 0, EDIT_NOLIMIT) );
 ImplCopyToSelectionClipboard();
@@ -1835,7 +1835,11 @@ void Edit::GetFocus()
 else if ( !mbActivePopup )
 {
 maUndoText = maText.toString();
-
+if(mbSelectAllSingleClick)
+{
+maSelection.Min() = 0;
+maSelection.Max() = maText.getLength();
+}
 SelectionOptions nSelOptions = 
GetSettings().GetStyleSettings().GetSelectionOptions();
 if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) )
 && ( GetGetFocusFlags() & 
(GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::CURSOR|GetFocusFlags::Mnemonic)
 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   59 ---
 vcl/source/gdi/dibtools.cxx   |  311 ++
 2 files changed, 188 insertions(+), 182 deletions(-)

New commits:
commit ce0e70fdd643b88b70cbcfa55847f0285116273a
Author: Caolán McNamara 
Date:   Mon Apr 17 16:10:42 2017 +0100

move the exception handling

Change-Id: Ie61a424a78be85c1dc54dd56451319356227f443

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 07ec46fc0b5d..c271fd4d5720 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -943,43 +943,56 @@ bool GraphicObject::SwapOut()
 
 bool GraphicObject::SwapOut( SvStream* pOStm )
 {
-bool bRet = !mbAutoSwapped;
-// swap out as a link
-if( pOStm == GRFMGR_AUTOSWAPSTREAM_LINK )
+bool bRet = false;
+try
 {
-maGraphic.SwapOutAsLink();
+bRet = !mbAutoSwapped;
+// swap out as a link
+if( pOStm == GRFMGR_AUTOSWAPSTREAM_LINK )
+{
+maGraphic.SwapOutAsLink();
+}
+else
+{
+bRet = bRet && maGraphic.SwapOut( pOStm );
+}
+
+if (bRet)
+mpGlobalMgr->ImplGraphicObjectWasSwappedOut(*this);
 }
-else
+catch(...)
 {
-bRet = bRet && maGraphic.SwapOut( pOStm );
+SAL_WARN( "svtools", "GraphicObject::SwapIn exception");
 }
-
-if (bRet)
-mpGlobalMgr->ImplGraphicObjectWasSwappedOut(*this);
-
 return bRet;
 }
 
 bool GraphicObject::SwapIn()
 {
 bool bRet = false;
-
-if( mbAutoSwapped )
+try
 {
-ImplAutoSwapIn();
-bRet = true;
-}
-else
-{
-bRet = maGraphic.SwapIn();
+if( mbAutoSwapped )
+{
+ImplAutoSwapIn();
+bRet = true;
+}
+else
+{
+bRet = maGraphic.SwapIn();
 
-if (bRet)
-mpGlobalMgr->ImplGraphicObjectWasSwappedIn(*this);
-}
+if (bRet)
+mpGlobalMgr->ImplGraphicObjectWasSwappedIn(*this);
+}
 
-if( bRet )
+if( bRet )
+{
+ImplAssignGraphicData();
+}
+}
+catch (...)
 {
-ImplAssignGraphicData();
+SAL_WARN( "svtools", "GraphicObject::SwapIn exception");
 }
 
 return bRet;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 1b0b2aee4e11..dc3666978fb7 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1389,192 +1389,185 @@ bool ImplWriteDIBBits(SvStream& rOStm, 
BitmapReadAccess& rAcc, BitmapReadAccess*
 
 bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, 
BitmapReadAccess& rAcc, BitmapReadAccess* pAccAlpha, bool bCompressed)
 {
-try
+const MapMode aMapPixel(MapUnit::MapPixel);
+DIBV5Header aHeader;
+sal_uLong nImageSizePos(0);
+sal_uLong nEndPos(0);
+sal_uInt32 nCompression(COMPRESS_NONE);
+bool bRet(false);
+
+aHeader.nSize = pAccAlpha ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE; // size 
dependent on CF_DIB type to use
+aHeader.nWidth = rAcc.Width();
+aHeader.nHeight = rAcc.Height();
+aHeader.nPlanes = 1;
+
+if(!pAccAlpha && isBitfieldCompression(rAcc.GetScanlineFormat()))
 {
-const MapMode aMapPixel(MapUnit::MapPixel);
-DIBV5Header aHeader;
-sal_uLong nImageSizePos(0);
-sal_uLong nEndPos(0);
-sal_uInt32 nCompression(COMPRESS_NONE);
-bool bRet(false);
-
-aHeader.nSize = pAccAlpha ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE; // 
size dependent on CF_DIB type to use
-aHeader.nWidth = rAcc.Width();
-aHeader.nHeight = rAcc.Height();
-aHeader.nPlanes = 1;
-
-if(!pAccAlpha && isBitfieldCompression(rAcc.GetScanlineFormat()))
-{
-aHeader.nBitCount = (ScanlineFormat::N16BitTcLsbMask == 
rAcc.GetScanlineFormat()) ? 16 : 32;
-aHeader.nSizeImage = rAcc.Height() * rAcc.GetScanlineSize();
-nCompression = BITFIELDS;
-}
-else
+aHeader.nBitCount = (ScanlineFormat::N16BitTcLsbMask == 
rAcc.GetScanlineFormat()) ? 16 : 32;
+aHeader.nSizeImage = rAcc.Height() * rAcc.GetScanlineSize();
+nCompression = BITFIELDS;
+}
+else
+{
+// #i5xxx# Limit bitcount to 24bit, the 32 bit cases are
+// not handled properly below (would have to set color
+// masks, and nCompression=BITFIELDS - but color mask is
+// not set for formats != *_TC_*). Note that this very
+// problem might cause trouble at other places - the
+// introduction of 32 bit RGBA bitmaps is relatively
+// recent.
+// #i59239# discretize bitcount to 1,4,8,24 (other cases
+// are not written below)
+const sal_uInt16 nBitCount(pAccAlpha ? 32 : 
discretizeBitcount(rAcc.GetBitCount()));
+aHeader.nBitCount = nBitCount;
+aHeader.nSizeImage = 

[Libreoffice-commits] core.git: svtools/source vcl/source

[Michael Meeks]

 svtools/source/control/tabbar.cxx |1 +
 vcl/source/window/toolbox2.cxx|1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5304bef5ffe7c7269f5293683916d19d3997a1c2
Author: Michael Meeks 
Date:   Thu Nov 26 13:56:54 2015 +

Cleanup last, partial include redux patch.

Change-Id: I1f6f9d4a1b7fae33529ae386e8733b5063de53b0

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index eb2f5aa..a71036b 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index aabf95c..dddb65f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Michael Meeks]

 svtools/source/misc/dialogcontrolling.cxx |   18 ++
 vcl/source/window/event.cxx   |6 --
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 9e2e8bb5e6c5a7df376f6ada90703f59c95f19d6
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Jul 14 12:51:04 2015 +0100

tdf#92706 - avoid dbaccess wizard crash.

Hold a VclPtr on the window, make reset cleaner, and don't crash
removing listeners from disposed windows.

Change-Id: I3efb71117fc45562d5c740578f5e33dabb2684fe
Reviewed-on: https://gerrit.libreoffice.org/17037
Reviewed-by: Julien Nabet serval2...@yahoo.fr
Tested-by: Julien Nabet serval2...@yahoo.fr

diff --git a/svtools/source/misc/dialogcontrolling.cxx 
b/svtools/source/misc/dialogcontrolling.cxx
index b381c43..ca62804 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -49,13 +49,13 @@ namespace svt
 
 struct DialogController_Data
 {
-vcl::Window rInstigator;
-::std::vector VclPtrvcl::Window aConcernedWindows;
+VclPtrvcl::Window  xInstigator;
+::std::vector VclPtrvcl::Window  aConcernedWindows;
 PWindowEventFilter  pEventFilter;
 PWindowOperator pOperator;
 
-DialogController_Data( vcl::Window _rInstigator, const 
PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator )
-:rInstigator( _rInstigator )
+DialogController_Data( vcl::Window _xInstigator, const 
PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator )
+:xInstigator( _xInstigator )
 ,pEventFilter( _pEventFilter )
 ,pOperator( _pOperator )
 {
@@ -66,14 +66,14 @@ namespace svt
 //= DialogController
 
 
-DialogController::DialogController( vcl::Window _rInstigator, const 
PWindowEventFilter _pEventFilter,
+DialogController::DialogController( vcl::Window _xInstigator, const 
PWindowEventFilter _pEventFilter,
 const PWindowOperator _pOperator )
-:m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, 
_pOperator ) )
+:m_pImpl( new DialogController_Data( _xInstigator, _pEventFilter, 
_pOperator ) )
 {
 DBG_ASSERT( m_pImpl-pEventFilter.get()  m_pImpl-pOperator.get(),
 DialogController::DialogController: invalid filter and/or 
operator! );
 
-m_pImpl-rInstigator.AddEventListener( LINK( this, DialogController, 
OnWindowEvent ) );
+m_pImpl-xInstigator-AddEventListener( LINK( this, DialogController, 
OnWindowEvent ) );
 }
 
 
@@ -85,7 +85,9 @@ namespace svt
 
 void DialogController::reset()
 {
-m_pImpl-rInstigator.RemoveEventListener( LINK( this, 
DialogController, OnWindowEvent ) );
+if (m_pImpl-xInstigator)
+m_pImpl-xInstigator-RemoveEventListener( LINK( this, 
DialogController, OnWindowEvent ) );
+m_pImpl-xInstigator.clear();
 m_pImpl-aConcernedWindows.clear();
 m_pImpl-pEventFilter.reset();
 m_pImpl-pOperator.reset();
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index ec6a9b6..b736141 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -249,7 +249,8 @@ void Window::AddEventListener( const Link rEventListener 
)
 
 void Window::RemoveEventListener( const Link rEventListener )
 {
-mpWindowImpl-maEventListeners.removeListener( rEventListener );
+if (mpWindowImpl)
+mpWindowImpl-maEventListeners.removeListener( rEventListener );
 }
 
 void Window::AddChildEventListener( const Link rEventListener )
@@ -259,7 +260,8 @@ void Window::AddChildEventListener( const Link 
rEventListener )
 
 void Window::RemoveChildEventListener( const Link rEventListener )
 {
-mpWindowImpl-maChildEventListeners.removeListener( rEventListener );
+if (mpWindowImpl)
+mpWindowImpl-maChildEventListeners.removeListener( rEventListener );
 }
 
 ImplSVEvent * Window::PostUserEvent( const Link rLink, void* pCaller, bool 
bReferenceLink )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Adolfo Jayme Barrientos]

 svtools/source/config/colorcfg.cxx |2 +-
 vcl/source/app/settings.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 595a109f8f5cd19cc72e1e44f2ae111427bb4330
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Wed May 13 05:43:03 2015 -0500

Slightly darken default workspace again to be easier on the eyes

Restoring the fix for tdf#79278 and tdf#72142, which was inadvertently 
dropped,
but with a better color.

Change-Id: Ifa5a85e5113713d6eff706a542d475a19caa0c13

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index c1323cf..9689be6 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -420,7 +420,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 {
 COL_WHITE, // DOCCOLOR
 0xc0c0c0, // DOCBOUNDARIES
-0xCFCFCF, // APPBACKGROUND
+0xDFDFDE, // APPBACKGROUND
 COL_LIGHTGRAY, // OBJECTBOUNDARIES
 COL_LIGHTGRAY, // TABLEBOUNDARIES
 COL_BLACK, // FONTCOLOR
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 52b5055..5d59336 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -716,7 +716,7 @@ void ImplStyleData::SetStandardStyles()
 maWindowTextColor   = Color( COL_BLACK );
 maDialogColor   = Color( COL_LIGHTGRAY );
 maDialogTextColor   = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xF0, 0xF0, 0xF0 );
+maWorkspaceColor= Color( 0xDF, 0xDF, 0xDE );
 maMonoColor = Color( COL_BLACK );
 maFieldColor= Color( COL_WHITE );
 maFieldTextColor= Color( COL_BLACK );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source vcl/source

[Adolfo Jayme Barrientos]

 svtools/source/config/colorcfg.cxx |2 +-
 vcl/source/app/settings.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b9ad46b23fdb39cd456cdc543cce346c6f325c3
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Thu Jul 24 15:21:33 2014 -0500

Resolves fdo#79278: not too dark, not too bright background color

This patch is based on Caolán's one at 
68075a61c28a5c72429f78776a822ed45fdcb4a7
I've chosen the background color used in Windows program Paint.NET as
our default background color. It's a nice compromise that doesn't look
out of place anywhere.

Change-Id: I5081201043be4a7ad6152d1ce59451daa4ece1ac
Reviewed-on: https://gerrit.libreoffice.org/10527
Reviewed-by: Stefan Knorr heinzless...@gmail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/10520
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index 23e7cb1..05d558c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -418,7 +418,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 {
 COL_WHITE, // DOCCOLOR
 0xc0c0c0, // DOCBOUNDARIES
-0xA9A9A9, // APPBACKGROUND
+0xCFCFCF, // APPBACKGROUND
 0xc0c0c0, // OBJECTBOUNDARIES
 0xc0c0c0, // TABLEBOUNDARIES
 COL_BLACK, // FONTCOLOR
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index d93ffe9..1c300d3 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -708,7 +708,7 @@ void ImplStyleData::SetStandardStyles()
 maWindowTextColor   = Color( COL_BLACK );
 maDialogColor   = Color( COL_LIGHTGRAY );
 maDialogTextColor   = Color( COL_BLACK );
-maWorkspaceColor= Color( 0xA9, 0xA9, 0xA9 );
+maWorkspaceColor= Color( 0xCF, 0xCF, 0xCF );
 maMonoColor = Color( COL_BLACK );
 maFieldColor= Color( COL_WHITE );
 maFieldTextColor= Color( COL_BLACK );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits