[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
sw/source/uibase/shells/tabsh.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 0006c15d8a496b7544beb09ba4de6bde866c13b0
Author: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Date: Sun May 8 12:05:58 2016 -0300
tdf#34362 Setting table border from toolbar resets "spacing to content"
Change-Id: Iec51c02ab389015d268849aa0dda870c11323f46
Signed-off-by: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/24764
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit ea7de7b2d3dc62b2ae73c2184398b227f8a85890)
Reviewed-on: https://gerrit.libreoffice.org/25982
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index ef4d98a..aee1703 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
@@ -480,10 +481,12 @@ void SwTableShell::Execute(SfxRequest )
if ( pArgs->GetItemState(RES_BOX, true, ) ==
SfxItemState::SET )
{
aBox = *static_cast(pBoxItem);
+sal_uInt16 nDefValue = MIN_BORDER_DIST;
if ( !rReq.IsAPI() )
-aBox.SetDistance(
std::max(rCoreBox.GetDistance(),sal_uInt16(55)) );
-else if ( aBox.GetDistance() < MIN_BORDER_DIST )
-aBox.SetDistance(
std::max(rCoreBox.GetDistance(),(sal_uInt16)MIN_BORDER_DIST) );
+nDefValue = 55;
+if ( !rReq.IsAPI() || aBox.GetDistance() < MIN_BORDER_DIST )
+for( SvxBoxItemLine k : o3tl::enumrange() )
+aBox.SetDistance( std::max(rCoreBox.GetDistance(k),
nDefValue) , k );
}
else
OSL_ENSURE( false, "where is BoxItem?" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/tabsh.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ea7de7b2d3dc62b2ae73c2184398b227f8a85890
Author: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Date: Sun May 8 12:05:58 2016 -0300
fdo#34362 Setting table border from toolbar resets "spacing to content"
Change-Id: Iec51c02ab389015d268849aa0dda870c11323f46
Signed-off-by: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/24764
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index ac84b52..c8b9afd 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
@@ -487,10 +488,12 @@ void SwTableShell::Execute(SfxRequest )
if ( pArgs->GetItemState(RES_BOX, true, ) ==
SfxItemState::SET )
{
aBox = *static_cast(pBoxItem);
+sal_uInt16 nDefValue = MIN_BORDER_DIST;
if ( !rReq.IsAPI() )
-aBox.SetDistance(
std::max(rCoreBox.GetDistance(),sal_uInt16(55)) );
-else if ( aBox.GetDistance() < MIN_BORDER_DIST )
-aBox.SetDistance(
std::max(rCoreBox.GetDistance(),(sal_uInt16)MIN_BORDER_DIST) );
+nDefValue = 55;
+if ( !rReq.IsAPI() || aBox.GetDistance() < MIN_BORDER_DIST )
+for( SvxBoxItemLine k : o3tl::enumrange() )
+aBox.SetDistance( std::max(rCoreBox.GetDistance(k),
nDefValue) , k );
}
else
OSL_ENSURE( false, "where is BoxItem?" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/statusbar/statusbar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 605494fd99ae8e54611899729783d1163cf9a5ba Author: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br Date: Sat Feb 7 21:14:38 2015 -0200 fix tdf#85027 Add button to StatusBar: Fit page to window Change-Id: Ibc6d2b8d3699caa0ba2baa51dbbf357f935fe5b2 Signed-off-by: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br Reviewed-on: https://gerrit.libreoffice.org/14363 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/uiconfig/sdraw/statusbar/statusbar.xml b/sd/uiconfig/sdraw/statusbar/statusbar.xml index 24224fe..78042ef 100644 --- a/sd/uiconfig/sdraw/statusbar/statusbar.xml +++ b/sd/uiconfig/sdraw/statusbar/statusbar.xml @@ -24,6 +24,7 @@ statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center statusbar:ownerdraw=true statusbar:width=16/ statusbar:statusbaritem xlink:href=.uno:PageStatus statusbar:align=left statusbar:width=124/ statusbar:statusbaritem xlink:href=.uno:LayoutStatus statusbar:align=left statusbar:autosize=true statusbar:width=54/ + statusbar:statusbaritem xlink:href=.uno:ZoomPage statusbar:align=center statusbar:ownerdraw=true statusbar:width=9/ statusbar:statusbaritem xlink:href=.uno:ZoomSlider statusbar:align=center statusbar:ownerdraw=true statusbar:width=130/ statusbar:statusbaritem xlink:href=.uno:Zoom statusbar:align=center statusbar:width=36/ /statusbar:statusbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/viewshel.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 2d5d52c2abc9fa882b1350a522f2989933fcb67b
Author: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Date: Mon Feb 2 03:45:51 2015 -0200
draw/impress - zoom in/out to the mouse position
Change-Id: I2bff851c683fdffe9a6074fedc2f2151650f79da
Signed-off-by: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Reviewed-on: https://gerrit.libreoffice.org/14307
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index a78c68f..83dc9ca 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -648,6 +648,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent
rCEvt, ::sd::Window* pWi
{
const long nOldZoom = GetActiveWindow()-GetZoom();
longnNewZoom;
+Point aOldMousePos =
GetActiveWindow()-PixelToLogic(rCEvt.GetMousePosPixel());
if( pData-GetDelta() 0L )
nNewZoom = std::max( (long) pWin-GetMinZoom(),
basegfx::zoomtools::zoomOut( nOldZoom ));
@@ -655,6 +656,10 @@ bool ViewShell::HandleScrollCommand(const CommandEvent
rCEvt, ::sd::Window* pWi
nNewZoom = std::min( (long) pWin-GetMaxZoom(),
basegfx::zoomtools::zoomIn( nOldZoom ));
SetZoom( nNewZoom );
+// Keep mouse at same doc point before zoom
+Point aNewMousePos =
GetActiveWindow()-PixelToLogic(rCEvt.GetMousePosPixel());
+SetWinViewPos(GetWinViewPos() - (aNewMousePos -
aOldMousePos), true);
+
Invalidate( SID_ATTR_ZOOM );
Invalidate( SID_ATTR_ZOOMSLIDER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/strings.src |6 ++
sd/source/ui/app/tmplctrl.cxx |3 +++
sd/source/ui/inc/strings.hrc |2 ++
3 files changed, 11 insertions(+)
New commits:
commit 45b881801785d6bb6df1304732243e87c918c7c9
Author: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Date: Tue Feb 3 02:08:25 2015 -0200
partial fix tdf#86611 (item #5) Draw statusbar tip
Change-Id: I5096c5ea1272e16969f9572ed40c60cdb9378b57
Signed-off-by: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Reviewed-on: https://gerrit.libreoffice.org/14308
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 3e11d18..991ee3a 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -995,6 +995,12 @@ String STR_PAGE_BACKGROUND_TXT
{
Text [ en-US ] = Background settings for all pages? ;
};
+
+String STR_STATUSBAR_MASTERPAGE
+{
+Text [ en-US ] = Slide Master name. Right-click for list and double-click
for dialog.;
+};
+
String STR_TITLE_RENAMESLIDE
{
Text [ en-US ] = Rename Slide;
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 15d8ec5..9f67052 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -28,6 +28,8 @@
#include drawdoc.hxx
#include sdattr.hrc
#include app.hrc
+#include sdresid.hxx
+#include strings.hrc
SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem );
@@ -64,6 +66,7 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
StatusBar rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb )
{
+GetStatusBar().SetQuickHelpText(GetId(),
SD_RESSTR(STR_STATUSBAR_MASTERPAGE));
}
SdTemplateControl::~SdTemplateControl()
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 1fa282c..aa92fb3 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -336,6 +336,8 @@
#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583)
#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584)
+#define STR_STATUSBAR_MASTERPAGE(RID_APP_START+600)
+
#define STR_TWAIN_NO_SOURCE (RID_APP_START+670)
#define STR_UNDO_VECTORIZE (RID_APP_START+671)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svx svx/source
include/svx/zoomsliderctrl.hxx |1 +
svx/source/stbctrls/zoomsliderctrl.cxx | 15 +--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 0bc37cf20044fe8fee0cc7dd5af3ee58304a3a0f
Author: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Date: Sat Jan 31 19:08:05 2015 -0200
tdf#47577 Zoom slider should only react to full click
Change-Id: If859754c956a634a96066ac407b70d6dd2759d53
Signed-off-by: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Reviewed-on: https://gerrit.libreoffice.org/14265
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 53740bd71a0ae569da36b9293ef22842a0b53f1e)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 7af69db..f35f825 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -49,6 +49,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const
SfxPoolItem* pState ) SAL_OVERRIDE;
virtual void Paint( const UserDrawEvent rEvt ) SAL_OVERRIDE;
virtual bool MouseButtonDown( const MouseEvent ) SAL_OVERRIDE;
+virtual bool MouseButtonUp( const MouseEvent ) SAL_OVERRIDE;
virtual bool MouseMove( const MouseEvent rEvt ) SAL_OVERRIDE;
};
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 8ea241b..1379321 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -45,6 +45,7 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
ImagemaDecreaseButton;
bool mbValuesSet;
bool mbOmitPaint;
+bool mbDraggingStarted;
SvxZoomSliderControl_Impl() :
mnCurrentZoom( 0 ),
@@ -57,7 +58,8 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
maIncreaseButton(),
maDecreaseButton(),
mbValuesSet( false ),
-mbOmitPaint( false ) {}
+mbOmitPaint( false ),
+mbDraggingStarted( false ) {}
};
const long nSliderXOffset = 20;
@@ -330,7 +332,10 @@ bool SvxZoomSliderControl::MouseButtonDown( const
MouseEvent rEvt )
mpImpl-mnCurrentZoom = basegfx::zoomtools::zoomIn(
static_castint(mpImpl-mnCurrentZoom) );
// click to slider
else if( nXDiff = nSliderXOffset nXDiff = aControlRect.GetWidth() -
nSliderXOffset )
+{
mpImpl-mnCurrentZoom = Offset2Zoom( nXDiff );
+mpImpl-mbDraggingStarted = true;
+}
if ( mpImpl-mnCurrentZoom mpImpl-mnMinZoom )
mpImpl-mnCurrentZoom = mpImpl-mnMinZoom;
@@ -345,6 +350,12 @@ bool SvxZoomSliderControl::MouseButtonDown( const
MouseEvent rEvt )
return true;
}
+bool SvxZoomSliderControl::MouseButtonUp( const MouseEvent )
+{
+mpImpl-mbDraggingStarted = false;
+return true;
+}
+
bool SvxZoomSliderControl::MouseMove( const MouseEvent rEvt )
{
if ( !mpImpl-mbValuesSet )
@@ -356,7 +367,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent
rEvt )
const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
// check mouse move with button pressed
-if ( 1 == nButtons )
+if ( 1 == nButtons mpImpl-mbDraggingStarted )
{
if ( nXDiff = nSliderXOffset nXDiff = aControlRect.GetWidth() -
nSliderXOffset )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/svx svx/source
include/sfx2/stbitem.hxx |2 +-
include/svx/zoomsliderctrl.hxx |1 +
svx/source/stbctrls/zoomsliderctrl.cxx | 15 +--
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 53740bd71a0ae569da36b9293ef22842a0b53f1e
Author: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Date: Sat Jan 31 19:08:05 2015 -0200
tdf#47577 Zoom slider should only react to full click
Change-Id: If859754c956a634a96066ac407b70d6dd2759d53
Signed-off-by: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
Reviewed-on: https://gerrit.libreoffice.org/14265
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 07121f8..f5e146c 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -102,7 +102,7 @@ protected:
virtual voidCommand( const CommandEvent rCEvt );
virtual boolMouseButtonDown( const MouseEvent );
virtual boolMouseMove( const MouseEvent );
-boolMouseButtonUp( const MouseEvent );
+virtual boolMouseButtonUp( const MouseEvent );
virtual voidPaint( const UserDrawEvent rUDEvt );
static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16
nAwtMouseButtons );
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 7af69db..f35f825 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -49,6 +49,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const
SfxPoolItem* pState ) SAL_OVERRIDE;
virtual void Paint( const UserDrawEvent rEvt ) SAL_OVERRIDE;
virtual bool MouseButtonDown( const MouseEvent ) SAL_OVERRIDE;
+virtual bool MouseButtonUp( const MouseEvent ) SAL_OVERRIDE;
virtual bool MouseMove( const MouseEvent rEvt ) SAL_OVERRIDE;
};
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index dcb0c55..c2e0f21 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -45,6 +45,7 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
ImagemaDecreaseButton;
bool mbValuesSet;
bool mbOmitPaint;
+bool mbDraggingStarted;
SvxZoomSliderControl_Impl() :
mnCurrentZoom( 0 ),
@@ -57,7 +58,8 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
maIncreaseButton(),
maDecreaseButton(),
mbValuesSet( false ),
-mbOmitPaint( false ) {}
+mbOmitPaint( false ),
+mbDraggingStarted( false ) {}
};
const long nSliderXOffset = 20;
@@ -331,7 +333,10 @@ bool SvxZoomSliderControl::MouseButtonDown( const
MouseEvent rEvt )
mpImpl-mnCurrentZoom = basegfx::zoomtools::zoomIn(
static_castint(mpImpl-mnCurrentZoom) );
// click to slider
else if( nXDiff = nSliderXOffset nXDiff = aControlRect.GetWidth() -
nSliderXOffset )
+{
mpImpl-mnCurrentZoom = Offset2Zoom( nXDiff );
+mpImpl-mbDraggingStarted = true;
+}
if ( mpImpl-mnCurrentZoom mpImpl-mnMinZoom )
mpImpl-mnCurrentZoom = mpImpl-mnMinZoom;
@@ -346,6 +351,12 @@ bool SvxZoomSliderControl::MouseButtonDown( const
MouseEvent rEvt )
return true;
}
+bool SvxZoomSliderControl::MouseButtonUp( const MouseEvent )
+{
+mpImpl-mbDraggingStarted = false;
+return true;
+}
+
bool SvxZoomSliderControl::MouseMove( const MouseEvent rEvt )
{
if ( !mpImpl-mbValuesSet )
@@ -357,7 +368,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent
rEvt )
const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
// check mouse move with button pressed
-if ( 1 == nButtons )
+if ( 1 == nButtons mpImpl-mbDraggingStarted )
{
if ( nXDiff = nSliderXOffset nXDiff = aControlRect.GetWidth() -
nSliderXOffset )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3949/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/95/6695/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/1348/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3949/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/4113/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/26/6626/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/95/6695/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/4113/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4117/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/1452/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4117/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/4076/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/3952/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/13/4113/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4117/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/3952/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3953/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/4076/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/1452/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3953/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/4117/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/6629/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/93/6693/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/8506/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/6629/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/8000/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3953/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/5943/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/8506/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/6537/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3951/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3951/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1785/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1785/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/1412/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3951/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1785/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/16/6716/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/3950/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/6537/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1785/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1785/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/6610/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/1412/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/50/3950/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/16/6716/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3951/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/6707/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/6538/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/07/6707/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/7454/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/6538/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/6706/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/6706/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/15/1415/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/6643/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/6643/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/6810/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/7454/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/16/1416/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/6810/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/1425/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/6538/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/16/1416/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 10 -- 1 file changed, 10 deletions(-) New commits: commit 2c9c54285b952b59b5262500089c9c1a7902deb2 Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com Date: Tue Feb 11 21:49:08 2014 -0200 Removes bogus UNO command AcceptChange and RejectChange These are not real commands. The real ones are: - AcceptTracedChange - RejectTracedChange Change-Id: I352cea4a5ffec73947932264783b61ae044f25cf Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com Reviewed-on: https://gerrit.libreoffice.org/8000 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 3cb9be4..0e871e4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -272,16 +272,6 @@ value xml:lang=en-USCopy Hyperlink Location/value /prop /node - node oor:name=.uno:AcceptChange oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=en-USAccept Change/value -/prop - /node - node oor:name=.uno:RejectChange oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=en-USReject Change/value -/prop - /node node oor:name=.uno:InsertBookmark oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USBookmar~k.../value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing
dev/null |binary icon-themes/crystal/cmd/lc_zoomoptimal.png|binary icon-themes/crystal/cmd/sc_zoomoptimal.png|binary icon-themes/human/cmd/lc_zoomoptimal.png |binary icon-themes/human/cmd/sc_zoomoptimal.png |binary icon-themes/industrial/cmd/lc_zoomoptimal.png |binary icon-themes/industrial/cmd/lc_zoomoptimal.xcf.bz2 |binary icon-themes/industrial/cmd/sc_zoomoptimal.png |binary icon-themes/oxygen/cmd/lc_zoomoptimal.png |binary icon-themes/oxygen/cmd/sc_zoomoptimal.png |binary icon-themes/tango/cmd/lc_zoomoptimal.png |binary icon-themes/tango/cmd/lc_zoomoptimal.xcf.bz2 |binary icon-themes/tango_testing/cmd/lc_zoomoptimal.png |binary 13 files changed New commits: commit aee6ad3022b4ba4a19e13cad81ab974ef4ba1724 Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com Date: Fri May 31 07:52:55 2013 -0300 Remove unused icons after cleaning up Math zoom After commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d , these deleted icons are useless since other UNO commands are used instead: View050 - Zoom50Percent View100 - Zoom100Percent View200 - Zoom200Percent Adjust - ZoomOptimal FitInWindow - ZoomOptimal Sorry I forgot to remove then in that commit. Note: As UNO command now is 'zoomoptimal' instead of 'adjust' and people feel 'adjust' icon better, I deleted the disliked 'zoomoptimal' icons and renamed 'adjust' icons to it. Change-Id: I141f2c4ad2f63928efb15faa5f68bc9c6dabc144 Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com Reviewed-on: https://gerrit.libreoffice.org/4117 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/crystal/cmd/lc_view100.png b/icon-themes/crystal/cmd/lc_view100.png deleted file mode 100644 index cc8ce15..000 Binary files a/icon-themes/crystal/cmd/lc_view100.png and /dev/null differ diff --git a/icon-themes/crystal/cmd/lc_adjust.png b/icon-themes/crystal/cmd/lc_zoomoptimal.png similarity index 100% rename from icon-themes/crystal/cmd/lc_adjust.png rename to icon-themes/crystal/cmd/lc_zoomoptimal.png diff --git a/icon-themes/crystal/cmd/sc_view100.png b/icon-themes/crystal/cmd/sc_view100.png deleted file mode 100644 index 8709d0a..000 Binary files a/icon-themes/crystal/cmd/sc_view100.png and /dev/null differ diff --git a/icon-themes/crystal/cmd/sc_adjust.png b/icon-themes/crystal/cmd/sc_zoomoptimal.png similarity index 100% rename from icon-themes/crystal/cmd/sc_adjust.png rename to icon-themes/crystal/cmd/sc_zoomoptimal.png diff --git a/icon-themes/galaxy/cmd/lc_adjust.png b/icon-themes/galaxy/cmd/lc_adjust.png deleted file mode 100644 index 228d958..000 Binary files a/icon-themes/galaxy/cmd/lc_adjust.png and /dev/null differ diff --git a/icon-themes/galaxy/cmd/lc_view100.png b/icon-themes/galaxy/cmd/lc_view100.png deleted file mode 100644 index 2f00d91..000 Binary files a/icon-themes/galaxy/cmd/lc_view100.png and /dev/null differ diff --git a/icon-themes/galaxy/cmd/sc_adjust.png b/icon-themes/galaxy/cmd/sc_adjust.png deleted file mode 100644 index d9d1a66..000 Binary files a/icon-themes/galaxy/cmd/sc_adjust.png and /dev/null differ diff --git a/icon-themes/galaxy/cmd/sc_view100.png b/icon-themes/galaxy/cmd/sc_view100.png deleted file mode 100644 index bfd1a58..000 Binary files a/icon-themes/galaxy/cmd/sc_view100.png and /dev/null differ diff --git a/icon-themes/hicontrast/cmd/lc_adjust.png b/icon-themes/hicontrast/cmd/lc_adjust.png deleted file mode 100644 index 60765d6..000 Binary files a/icon-themes/hicontrast/cmd/lc_adjust.png and /dev/null differ diff --git a/icon-themes/hicontrast/cmd/lc_view100.png b/icon-themes/hicontrast/cmd/lc_view100.png deleted file mode 100644 index 33af72d..000 Binary files a/icon-themes/hicontrast/cmd/lc_view100.png and /dev/null differ diff --git a/icon-themes/hicontrast/cmd/sc_adjust.png b/icon-themes/hicontrast/cmd/sc_adjust.png deleted file mode 100644 index fdaabf5..000 Binary files a/icon-themes/hicontrast/cmd/sc_adjust.png and /dev/null differ diff --git a/icon-themes/hicontrast/cmd/sc_view100.png b/icon-themes/hicontrast/cmd/sc_view100.png deleted file mode 100644 index 2254149..000 Binary files a/icon-themes/hicontrast/cmd/sc_view100.png and /dev/null differ diff --git a/icon-themes/human/cmd/lc_adjust.png b/icon-themes/human/cmd/lc_adjust.png deleted file mode 100644 index 4beea80..000 Binary files a/icon-themes/human/cmd/lc_adjust.png and /dev/null differ diff --git a/icon-themes/human/cmd/lc_view100.png b/icon-themes/human/cmd/lc_view100.png deleted file mode 100644 index 2c52084..000 Binary files a/icon-themes/human/cmd/lc_view100.png and /dev/null differ diff --git a/icon-themes/human/cmd/lc_zoomoptimal.png b/icon-themes/human/cmd/lc_zoomoptimal.png index 575284b..4beea80
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mailmergechildwindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eda8111fdf9b1c69935237106a73d1c53c2776e1
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Mon Nov 25 23:34:09 2013 -0200
Mailmerge shows wrong number of emails to be sent
The progress bar is ok, but the text is displayed with the total
number of registers instead of the amount selected to be used.
Change-Id: I81da0e7ba9f193366e12cbf81118e36a43bcaad4
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6810
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 682ab22..c1dc07a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -648,7 +648,7 @@ void SwSendMailDialog::UpdateTransferStatus()
{
OUString sStatus( m_sTransferStatus );
sStatus = sStatus.replaceFirst(%1, OUString::number(m_nSendCount) );
-sStatus = sStatus.replaceFirst(%2,
OUString::number(m_pImpl-nDocumentCount));
+sStatus = sStatus.replaceFirst(%2,
OUString::number(m_pImpl-aDescriptors.size()));
m_aTransferStatusFT.SetText(sStatus);
sStatus = m_sErrorStatus.replaceFirst(%1,
OUString::number(m_nErrorCount) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/ui/dbui/mailmergechildwindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aa3297af50b9a197428565bb927cf566a9198435
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Mon Nov 25 23:34:09 2013 -0200
Mailmerge shows wrong number of emails to be sent
The progress bar is ok, but the text is displayed with the total
number of registers instead of the amount selected to be used.
Change-Id: I81da0e7ba9f193366e12cbf81118e36a43bcaad4
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6810
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit eda8111fdf9b1c69935237106a73d1c53c2776e1)
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 682ab22..c1dc07a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -648,7 +648,7 @@ void SwSendMailDialog::UpdateTransferStatus()
{
OUString sStatus( m_sTransferStatus );
sStatus = sStatus.replaceFirst(%1, OUString::number(m_nSendCount) );
-sStatus = sStatus.replaceFirst(%2,
OUString::number(m_pImpl-nDocumentCount));
+sStatus = sStatus.replaceFirst(%2,
OUString::number(m_pImpl-aDescriptors.size()));
m_aTransferStatusFT.SetText(sStatus);
sStatus = m_sErrorStatus.replaceFirst(%1,
OUString::number(m_nErrorCount) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.hxx |4 -
editeng/source/editeng/impedit3.cxx | 140 ++--
editeng/source/editeng/impedit4.cxx |2
3 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit 142e89e6c2f5ae292cf70bffaf2d9dbc8c9a2ecd
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sun Sep 15 20:24:36 2013 -0300
sal_Bool to bool in ImpEditEngine
Change-Id: I76dc0343fd735104827b4803c5440570afe86174
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6693
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 83704be..f6e2407 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -557,9 +557,9 @@ private:
EditPaM ImpFastInsertText( EditPaM aPaM, const OUString rStr
);
EditPaM ImpFastInsertParagraph( sal_Int32 nPara );
-sal_BoolImpCheckRefMapMode();
+boolImpCheckRefMapMode();
-sal_BoolImplHasText() const;
+boolImplHasText() const;
voidImpFindKashidas( ContentNode* pNode, sal_uInt16
nStart, sal_uInt16 nEnd, std::vectorsal_uInt16 rArray );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index d100109..2375b41 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star::linguistic2;
struct TabInfo
{
-sal_BoolbValid;
+boolbValid;
SvxTabStop aTabStop;
xub_StrLen nCharPos;
@@ -95,7 +95,7 @@ struct TabInfo
longnStartPosX;
longnTabPos;
-TabInfo() { bValid = sal_False; }
+TabInfo() { bValid = false; }
};
Point Rotate( const Point rPoint, short nOrientation, const Point rOrigin )
@@ -246,7 +246,7 @@ static Point lcl_ImplCalcRotatedPos( Point rPos, Point
rOrigin, double nSin, dou
return aTranslatedPos;
}
-static sal_Bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
+static bool lcl_IsLigature( sal_Unicode cCh, sal_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
{
// Lam + Alef
return ( 0x644 == cCh 0x627 == cNextCh ) ||
@@ -254,11 +254,11 @@ static sal_Bool lcl_IsLigature( sal_Unicode cCh,
sal_Unicode cNextCh ) // For Ka
( 0x628 == cCh 0x631 == cNextCh );
}
-static sal_Bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) //
For Kashidas from sw/source/core/text/porlay.txt
+static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For
Kashidas from sw/source/core/text/porlay.txt
{
// Alef, Dal, Thal, Reh, Zain, and Waw do not connect to the left
-sal_Bool bRet = 0x627 != cPrevCh 0x62F != cPrevCh 0x630 != cPrevCh
-0x631 != cPrevCh 0x632 != cPrevCh 0x648 != cPrevCh;
+bool bRet = 0x627 != cPrevCh 0x62F != cPrevCh 0x630 != cPrevCh
+0x631 != cPrevCh 0x632 != cPrevCh 0x648 != cPrevCh;
// check for ligatures cPrevChar + cChar
if ( bRet )
@@ -369,12 +369,12 @@ void ImpEditEngine::FormatDoc()
StartOnlineSpellTimer();
long nY = 0;
-sal_Bool bGrow = sal_False;
+bool bGrow = false;
Font aOldFont( GetRefDevice()-GetFont() );
// Here already, so that not always in CreateLines...
-sal_Bool bMapChanged = ImpCheckRefMapMode();
+bool bMapChanged = ImpCheckRefMapMode();
aInvalidRect = Rectangle(); // make empty
for ( sal_Int32 nPara = 0; nPara GetParaPortions().Count(); nPara++ )
@@ -405,7 +405,7 @@ void ImpEditEngine::FormatDoc()
pPP-GetLines().Reset();
}
}
-bGrow = sal_True;
+bGrow = true;
if ( IsCallParaInsertedOrDeleted() )
GetEditEnginePtr()-ParagraphHeightChanged( nPara );
pParaPortion-SetMustRepaint( sal_False );
@@ -490,17 +490,17 @@ void ImpEditEngine::FormatDoc()
LeaveBlockNotifications();
}
-sal_Bool ImpEditEngine::ImpCheckRefMapMode()
+bool ImpEditEngine::ImpCheckRefMapMode()
{
-sal_Bool bChange = sal_False;
+bool bChange = false;
if ( aStatus.DoFormat100() )
{
MapMode aMapMode( GetRefDevice()-GetMapMode() );
if ( aMapMode.GetScaleX().GetNumerator() !=
aMapMode.GetScaleX().GetDenominator() )
-bChange = sal_True;
+bChange = true;
else if ( aMapMode.GetScaleY().GetNumerator() !=
aMapMode.GetScaleY().GetDenominator() )
-bChange = sal_True;
+bChange = true;
if ( bChange )
{
@@ -584,8 +584,8 @@ sal_Bool ImpEditEngine::CreateLines
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/timer.hxx| 17 ++--
vcl/source/app/timer.cxx | 92 ++-
2 files changed, 34 insertions(+), 75 deletions(-)
New commits:
commit 205b77054a03e7d665167d6693ebaf476773aaf2
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sun Nov 17 00:35:56 2013 -0200
sal_Bool to bool in VCL Timer and minor cleanups
Change-Id: I72e3987af4509239b2e989483b7396512c17e48b
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6695
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index fc37a0e..ff9a4cf 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -27,17 +27,13 @@
struct ImplTimerData;
struct ImplSVData;
-// -
-// - Timer -
-// -
-
class VCL_DLLPUBLIC Timer
{
protected:
ImplTimerData* mpTimerData;
-sal_uLong mnTimeout;
-sal_BoolmbActive;
-sal_BoolmbAuto;
+sal_uLong mnTimeout;
+boolmbActive;
+boolmbAuto;
LinkmaTimeoutHdl;
public:
@@ -51,8 +47,8 @@ public:
voidStop();
voidSetTimeout( sal_uLong nTimeout );
-sal_uLong GetTimeout() const { return mnTimeout; }
-sal_BoolIsActive() const { return mbActive; }
+sal_uLong GetTimeout() const { return mnTimeout; }
+sal_BoolIsActive() const { return mbActive ? sal_True : sal_False;
}
voidSetTimeoutHdl( const Link rLink ) { maTimeoutHdl = rLink;
}
const Link GetTimeoutHdl() const { return maTimeoutHdl; }
@@ -63,9 +59,6 @@ public:
static void ImplTimerCallbackProc();
};
-// -
-// - AutoTimer -
-// -
class VCL_DLLPUBLIC AutoTimer : public Timer
{
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index de5efca..dab9927 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -28,26 +28,18 @@
#include salinst.hxx
-// ===
-
#define MAX_TIMER_PERIOD((sal_uLong)0x)
-// -
-// - TimeManager-Types -
-// -
-
struct ImplTimerData
{
ImplTimerData* mpNext; // Pointer to the next Instance
-Timer* mpSVTimer; // Pointer to SV Timer instance
-sal_uLong mnUpdateTime; // Last Update Time
-sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack
+Timer* mpTimer;// Pointer to VCL Timer instance
+sal_uLong mnUpdateTime; // Last Update Time
+sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack
boolmbDelete; // Was timer deleted during Update()?
boolmbInTimeout;// Are we in a timeout handler?
};
-// ===
-
void Timer::ImplDeInitTimer()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -58,10 +50,10 @@ void Timer::ImplDeInitTimer()
do
{
ImplTimerData* pTempTimerData = pTimerData;
-if ( pTimerData-mpSVTimer )
+if ( pTimerData-mpTimer )
{
-pTimerData-mpSVTimer-mbActive = sal_False;
-pTimerData-mpSVTimer-mpTimerData = NULL;
+pTimerData-mpTimer-mbActive = false;
+pTimerData-mpTimer-mpTimerData = NULL;
}
pTimerData = pTimerData-mpNext;
delete pTempTimerData;
@@ -75,8 +67,6 @@ void Timer::ImplDeInitTimer()
}
}
-// ---
-
static void ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS )
{
if ( !nMS )
@@ -89,16 +79,14 @@ static void ImplStartTimer( ImplSVData* pSVData, sal_uLong
nMS )
}
}
-// ---
-
void Timer::ImplTimerCallbackProc()
{
ImplSVData* pSVData = ImplGetSVData();
ImplTimerData* pTimerData;
ImplTimerData* pPrevTimerData;
-sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
-sal_uLong nDeltaTime;
-sal_uLong nTime = Time::GetSystemTicks();
+sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
+sal_uLong nDeltaTime;
+sal_uLong nTime = Time::GetSystemTicks();
if ( pSVData-mbNoCallTimer )
return;
@@ -116,21 +104,21 @@ void Timer::ImplTimerCallbackProc()
!pTimerData-mbDelete !pTimerData-mbInTimeout )
{
// time has expired
-if ( (pTimerData-mnUpdateTime+pTimerData-mpSVTimer-mnTimeout)
= nTime )
+if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) =
nTime )
{
// set new update
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/ruler.hxx|2 +-
svtools/source/control/ruler.cxx | 24
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 912d6d171603cdc68c600ab713e22eeca2c1f58a
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Mon Nov 18 01:30:49 2013 -0200
fdo#65355 Ruler Comment control doesn't disappears
ImplDraw() should not be directly called because it avoids
overriden Paint() method.
Change-Id: I0f0f6b4af231c1ea50a23fb96f3c9018b5ce2d31
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6707
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index eff79e251..a6ae1e5 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -767,7 +767,7 @@ public:
RulerSelection GetHoverSelection() const { return maHoverSelection; }
using Window::GetType;
-RulerType GetType( const Point rPos, sal_uInt16* pAryPos = NULL )
const;
+RulerType GetType( const Point rPos, sal_uInt16* pAryPos = NULL );
voidSetNullOffset( long nPos );
longGetNullOffset() const;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 5a0b32f..f6808a2 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1868,7 +1868,7 @@ void Ruler::ImplDrag( const Point rPos )
Drag();
// and redraw
-ImplDraw();
+Paint(Rectangle());
// reset the data as before cancel
*mpDragData = aTempData;
@@ -1889,7 +1889,7 @@ void Ruler::ImplDrag( const Point rPos )
// redraw
if ( mbFormat )
-ImplDraw();
+Paint(Rectangle());
}
mnDragScroll = 0;
@@ -1921,7 +1921,7 @@ void Ruler::ImplEndDrag()
mnStartDragPos = 0;
// redraw
-ImplDraw();
+Paint(Rectangle());
}
IMPL_LINK_NOARG(Ruler, ImplUpdateHdl)
@@ -1932,7 +1932,7 @@ IMPL_LINK_NOARG(Ruler, ImplUpdateHdl)
if ( mnUpdateFlags RULER_UPDATE_DRAW )
{
mnUpdateFlags = 0;
-ImplDraw();
+Paint(Rectangle());
}
else if ( mnUpdateFlags RULER_UPDATE_LINES )
{
@@ -1954,7 +1954,7 @@ void Ruler::MouseButtonDown( const MouseEvent rMEvt )
// update ruler
if ( mbFormat )
{
-ImplDraw();
+Paint(Rectangle());
mnUpdateFlags = ~RULER_UPDATE_DRAW;
}
@@ -2062,7 +2062,7 @@ void Ruler::MouseMove( const MouseEvent rMEvt )
if ( mbFormat )
{
-ImplDraw();
+Paint(Rectangle());
mnUpdateFlags = ~RULER_UPDATE_DRAW;
}
mpPreviousHitTest.swap(mpCurrentHitTest);
@@ -2189,7 +2189,7 @@ void Ruler::StateChanged( StateChangedType nType )
else if ( nType == STATE_CHANGE_UPDATEMODE )
{
if ( IsReallyVisible() IsUpdateMode() )
-ImplDraw();
+Paint(Rectangle());
}
else if ( (nType == STATE_CHANGE_ZOOM) ||
(nType == STATE_CHANGE_CONTROLFONT) )
@@ -2291,7 +2291,7 @@ sal_Bool Ruler::StartDocDrag( const MouseEvent rMEvt,
RulerType eDragType )
// update ruler
if ( mbFormat )
{
-ImplDraw();
+Paint(Rectangle());
mnUpdateFlags = ~RULER_UPDATE_DRAW;
}
@@ -2350,15 +2350,15 @@ void Ruler::CancelDrag()
}
}
-RulerType Ruler::GetType( const Point rPos, sal_uInt16* pAryPos ) const
+RulerType Ruler::GetType( const Point rPos, sal_uInt16* pAryPos )
{
RulerSelection aHitTest;
// update ruler
if ( IsReallyVisible() mbFormat )
{
-((Ruler*)this)-ImplDraw();
-((Ruler*)this)-mnUpdateFlags = ~RULER_UPDATE_DRAW;
+Paint(Rectangle());
+mnUpdateFlags = ~RULER_UPDATE_DRAW;
}
ImplHitTest( rPos, aHitTest );
@@ -2790,7 +2790,7 @@ RulerUnitData Ruler::GetCurrentRulerUnit() const
void Ruler::DrawTicks()
{
mbFormat = sal_True;
-ImplDraw();
+Paint(Rectangle());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/swruler.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 0b4b02d9b6cf5b939dc1522d8348e3f4d6f955d4
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Tue Nov 19 00:29:06 2013 -0200
Remove now useless RTL code-comment on SwCommentRuler
RTL work was done by someone else.
Change-Id: I8b8b923ff3e336427a2dadeccab7c7176d51b2fe
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6716
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index 914231b..0697639 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -241,8 +241,6 @@ void SwCommentRuler::UpdateCommentHelpText()
SetQuickHelpText( OUString( SW_RESSTR( nTooltipResId ) ) );
}
-// NOTE: If sometime ahead SwSidebar moves from page right side due RTL layout,
-// change how this rectangle is used by callers
// TODO Make Ruler return its central rectangle instead of margins.
Rectangle SwCommentRuler::GetCommentControlRegion()
{
@@ -255,14 +253,15 @@ Rectangle SwCommentRuler::GetCommentControlRegion()
if (!pPostItMgr)
return Rectangle();
+unsigned long nSidebarWidth = pPostItMgr-GetSidebarWidth(true);
//FIXME When the page width is larger then screen, the ruler is misplaced
by one pixel
if (GetTextRTL())
- nLeft = GetPageOffset() - pPostItMgr-GetSidebarWidth(true) +
GetBorderOffset();
+ nLeft = GetPageOffset() - nSidebarWidth + GetBorderOffset();
else
nLeft = GetWinOffset() + GetPageOffset() +
mpSwWin-LogicToPixel(Size(GetPageWidth(), 0)).Width();
long nTop= 0 + 4; // Ruler::ImplDraw uses RULER_OFF (value: 3px) as
offset, and Ruler::ImplFormat adds one extra pixel
// Somehow pPostItMgr-GetSidebarBorderWidth() returns border width
already doubled
-long nRight = nLeft+ pPostItMgr-GetSidebarWidth(true) +
pPostItMgr-GetSidebarBorderWidth(true);
+long nRight = nLeft + nSidebarWidth +
pPostItMgr-GetSidebarBorderWidth(true);
long nBottom = nTop + GetRulerVirHeight() - 3;
Rectangle aRect(nLeft, nTop, nRight, nBottom);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/inc/swruler.hxx | 19 ++
sw/source/ui/misc/swruler.cxx | 54 --
2 files changed, 60 insertions(+), 13 deletions(-)
New commits:
commit 55716b1ed969073f273c00baedb56d8f5de93761
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sun Nov 17 17:06:38 2013 -0200
Highlight fade in SwCommentRuler
It was not implemented, though designed.
No delay was used before start fading. I don't think it flickers.
https://wiki.documentfoundation.org/Design/Whiteboards/Comments_Ruler_Control#Behavior
Change-Id: I419220aac0a9cbfae328874cf6015d9530b93784
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6706
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/inc/swruler.hxx b/sw/source/ui/inc/swruler.hxx
index 10a23c1..aebf0b9 100644
--- a/sw/source/ui/inc/swruler.hxx
+++ b/sw/source/ui/inc/swruler.hxx
@@ -45,6 +45,8 @@ protected:
SwViewShell * mpViewShell; // Shell to check if there is any comments
on doc and their visibility
SwEditWin * mpSwWin; // Used to get SwView to change the SideBar
visibility
boolmbIsHighlighted; // If comment control is highlighted (mouse
is over it)
+Timer maFadeTimer; // Timer for high/'low'light fading
+int mnFadeRate; // From 0 to 100. 0 means not highlighted.
VirtualDevice maVirDev; // VirtualDevice of this window. Just for
convenience.
/**
@@ -77,7 +79,7 @@ protected:
* Get the rectangle area that should be used to draw the comment control.
*
* It is horizontally aligned to the SideBar panel.
- * \param Rectangle The area where the comment control is.
+ * \return The area where the comment control is.
*/
Rectangle GetCommentControlRegion();
@@ -98,6 +100,21 @@ protected:
* Update the tooltip text.
*/
void UpdateCommentHelpText();
+
+/**
+ * Get the proper color between two options, according to current status.
+ *
+ * The return color can be one of the given colors, or a merged one.
+ * It depends on highlight fadind status.
+ *
+ * \param rHighColor color used to highlight status
+ * \param rLowColor color used to normal status
+ * \return The proper color to used in moment
+ */
+Color GetFadedColor(const Color rHighColor, const Color rLowColor);
+
+/// Fade timer callback.
+DECL_LINK(FadeHandler, void *);
};
#endif
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index 0697639..fa396d0 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -10,7 +10,6 @@
// FIX fdo#38246 https://bugs.libreoffice.org/show_bug.cgi?id=38246
// Design proposal:
https://wiki.documentfoundation.org/Design/Whiteboards/Comments_Ruler_Control
// TODO Alpha blend border when it doesn't fit in window
-// TODO Delayed highlight fading when user moves mouse over and out the control
#include swruler.hxx
@@ -40,8 +39,12 @@ SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh,
Window* pParent, SwEditWin
, mpViewShell(pViewSh)
, mpSwWin(pWin)
, mbIsHighlighted(false)
+, mnFadeRate(0)
, maVirDev( *this )
{
+// Set fading timeout: 5 x 40ms = 200ms
+maFadeTimer.SetTimeout(40);
+maFadeTimer.SetTimeoutHdl( LINK( this, SwCommentRuler, FadeHandler ) );
}
// Destructor
@@ -57,6 +60,7 @@ void SwCommentRuler::Paint( const Rectangle rRect )
DrawCommentControl();
}
+
void SwCommentRuler::DrawCommentControl()
{
const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -67,10 +71,8 @@ void SwCommentRuler::DrawCommentControl()
// Paint comment control background
// TODO Check if these are best colors to be used
-if ( mbIsHighlighted )
-maVirDev.SetFillColor( rStyleSettings.GetDarkShadowColor() );
-else
-maVirDev.SetFillColor( rStyleSettings.GetWorkspaceColor() );
+Color aBgColor = GetFadedColor( rStyleSettings.GetDarkShadowColor(),
rStyleSettings.GetWorkspaceColor() );
+maVirDev.SetFillColor( aBgColor );
if ( mbIsHighlighted || !bIsCollapsed )
{
@@ -85,6 +87,7 @@ void SwCommentRuler::DrawCommentControl()
maVirDev.DrawRect( Rectangle( Point(), aControlRect.GetSize() ) );
+// Label and arrow tip
OUString aLabel( SW_RESSTR ( STR_COMMENTS_LABEL ) );
// Get label and arrow coordinates
Point aLabelPos;
@@ -130,15 +133,15 @@ void SwCommentRuler::DrawCommentControl()
}
// Draw label
-const Color rTextColor = mbIsHighlighted ?
rStyleSettings.GetButtonTextColor() : rStyleSettings.GetDeactiveTextColor();
-maVirDev.SetTextColor( rTextColor );
+Color aTextColor = GetFadedColor( rStyleSettings.GetButtonTextColor(),
rStyleSettings.GetDeactiveTextColor() );
+maVirDev.SetTextColor
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx | 169 +-
1 file changed, 86 insertions(+), 83 deletions(-)
New commits:
commit b29464a8fa58d776279c6da0247946eefad9be00
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Mon Nov 11 22:24:20 2013 -0200
less if-nesting in ThumnailView
Easier to read.
Change-Id: I1ceb551d8badffb211b1f444b61375a03cac1348
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6643
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 6279174..592c8b6 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -732,113 +732,116 @@ void ThumbnailView::MakeItemVisible( sal_uInt16 nItemId
)
void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt )
{
-if ( rMEvt.IsLeft() )
+if ( !rMEvt.IsLeft() )
{
-size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
-ThumbnailViewItem* pItem = ImplGetItem(nPos);
+Control::MouseButtonDown( rMEvt );
+return;
+}
-if (pItem)
-{
-if ( rMEvt.GetClicks() == 1 )
-{
-if (rMEvt.IsMod1())
-{
-//Keep selected item group state and just invert current
desired one state
-pItem-setSelection(!pItem-isSelected());
+size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
+ThumbnailViewItem* pItem = ImplGetItem(nPos);
-//This one becomes the selection range start position if
it changes its state to selected otherwise resets it
-mpStartSelRange = pItem-isSelected() ?
mFilteredItemList.begin() + nPos : mFilteredItemList.end();
-}
-else if (rMEvt.IsShift() mpStartSelRange !=
mFilteredItemList.end())
-{
-std::pairsize_t,size_t aNewRange;
-aNewRange.first = mpStartSelRange -
mFilteredItemList.begin();
-aNewRange.second = nPos;
+if ( !pItem )
+{
+deselectItems();
+Control::MouseButtonDown( rMEvt );
+return;
+}
-if (aNewRange.first aNewRange.second)
-std::swap(aNewRange.first,aNewRange.second);
+if ( rMEvt.GetClicks() == 2 )
+{
+OnItemDblClicked(pItem);
+return;
+}
-//Deselect the ones outside of it
-for (size_t i = 0, n = mFilteredItemList.size(); i n;
++i)
-{
-ThumbnailViewItem *pCurItem = mFilteredItemList[i];
+if ( rMEvt.GetClicks() == 1 )
+{
+if (rMEvt.IsMod1())
+{
+//Keep selected item group state and just invert current desired
one state
+pItem-setSelection(!pItem-isSelected());
-if (pCurItem-isSelected() (i aNewRange.first ||
i aNewRange.second))
-{
-pCurItem-setSelection(false);
+//This one becomes the selection range start position if it
changes its state to selected otherwise resets it
+mpStartSelRange = pItem-isSelected() ? mFilteredItemList.begin()
+ nPos : mFilteredItemList.end();
+}
+else if (rMEvt.IsShift() mpStartSelRange != mFilteredItemList.end())
+{
+std::pairsize_t,size_t aNewRange;
+aNewRange.first = mpStartSelRange - mFilteredItemList.begin();
+aNewRange.second = nPos;
-if (pCurItem-isVisible())
-DrawItem(pCurItem);
+if (aNewRange.first aNewRange.second)
+std::swap(aNewRange.first,aNewRange.second);
-maItemStateHdl.Call(pCurItem);
-}
-}
+//Deselect the ones outside of it
+for (size_t i = 0, n = mFilteredItemList.size(); i n; ++i)
+{
+ThumbnailViewItem *pCurItem = mFilteredItemList[i];
-size_t nSelPos = mpStartSelRange -
mFilteredItemList.begin();
+if (pCurItem-isSelected() (i aNewRange.first || i
aNewRange.second))
+{
+pCurItem-setSelection(false);
-//Select the items between start range and the selected
item
-if (nSelPos != nPos)
-{
-int dir = nSelPos nPos ? 1 : -1;
-size_t nCurPos = nSelPos + dir;
+if (pCurItem-isVisible())
+DrawItem(pCurItem);
+
+maItemStateHdl.Call(pCurItem);
+}
+}
+
+size_t nSelPos = mpStartSelRange
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsview.cxx | 10 +++---
sfx2/source/control/thumbnailview.cxx |7 ++-
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit a5156a41633701fd0591640ba665fdb10221fe71
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sun Nov 10 10:46:42 2013 -0200
ThumbnailView: item found by mouse pos is always visible
-- so it does not need to check it again
Change-Id: Id6fc2732bde8dd7f6011828b6bc29d7947bf6312
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6629
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 888c3ad..14e8f65 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -180,14 +180,10 @@ void RecentDocsView::MouseButtonDown( const MouseEvent
rMEvt )
size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
ThumbnailViewItem* pItem = ImplGetItem(nPos);
-if (pItem pItem-isVisible())
+if (pItem)
{
-Rectangle aRect(pItem-getDrawArea());
-if (aRect.IsInside(rMEvt.GetPosPixel()))
-{
-OnItemDblClicked(pItem);
-return;
-}
+OpenItem(pItem);
+return;
}
}
ThumbnailView::MouseButtonDown( rMEvt );
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index e3e1b8f..6279174 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -737,7 +737,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent
rMEvt )
size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
ThumbnailViewItem* pItem = ImplGetItem(nPos);
-if (pItem pItem-isVisible())
+if (pItem)
{
if ( rMEvt.GetClicks() == 1 )
{
@@ -829,10 +829,7 @@ void ThumbnailView::MouseButtonDown( const MouseEvent
rMEvt )
}
else if ( rMEvt.GetClicks() == 2 )
{
-Rectangle aRect(pItem-getDrawArea());
-
-if (aRect.IsInside(rMEvt.GetPosPixel()))
-OnItemDblClicked(pItem);
+OnItemDblClicked(pItem);
}
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/recentdocsview.hxx|2 ++
sfx2/source/control/recentdocsview.cxx | 27 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit a29c9eff781fd6bceee5078669a53c52086b5664
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Thu Nov 7 13:59:42 2013 -0200
single-click for open recent documents in new Start Center
Change-Id: I34c6a5f9057707cdd1e2f4f82024818e7c8a6630
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6610
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 0552636..2edace5 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -58,7 +58,9 @@ public:
DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* );
protected:
+virtual void MouseButtonDown( const MouseEvent rMEvt );
virtual void OnItemDblClicked(ThumbnailViewItem *pItem);
+void OpenItem( const ThumbnailViewItem *pItem );
bool isAcceptedFile(const OUString rURL) const;
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 5e3c796..706214e 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -175,9 +175,34 @@ void RecentDocsView::loadRecentDocs()
Invalidate();
}
+void RecentDocsView::MouseButtonDown( const MouseEvent rMEvt )
+{
+if ( rMEvt.IsLeft() )
+{
+size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
+ThumbnailViewItem* pItem = ImplGetItem(nPos);
+
+if (pItem pItem-isVisible())
+{
+Rectangle aRect(pItem-getDrawArea());
+if (aRect.IsInside(rMEvt.GetPosPixel()))
+{
+OnItemDblClicked(pItem);
+return;
+}
+}
+}
+ThumbnailView::MouseButtonDown( rMEvt );
+}
+
void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *pItem)
{
-RecentDocsViewItem* pRecentItem = dynamic_castRecentDocsViewItem*(pItem);
+OpenItem( pItem );
+}
+
+void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
+{
+const RecentDocsViewItem* pRecentItem = dynamic_castconst
RecentDocsViewItem*(pItem);
Reference XDispatch xDispatch;
Reference XDispatchProvider xDispatchProvider;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/colrowba.hxx | 32 ++-
sc/source/ui/inc/hdrcont.hxx | 24 +--
sc/source/ui/view/colrowba.cxx | 33 +++
sc/source/ui/view/hdrcont.cxx | 85 +++--
4 files changed, 73 insertions(+), 101 deletions(-)
New commits:
commit b64d19a6520871eaee908c79e9aaf76ee477e143
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sat Nov 2 23:37:34 2013 -0200
German translations and minor clean-up in ScHeaderControls
Some methods properly defined as const methods
Change-Id: I59bc371bbb3adc6df2b96b82a0968a8693622ff8
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6537
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index 2a0e976..2bb2c68 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -26,9 +26,6 @@
class ScHeaderFunctionSet;
class ScHeaderSelectionEngine;
-// ---
-
-
class ScColBar : public ScHeaderControl
{
ScViewData* pViewData;
@@ -40,19 +37,19 @@ public:
ScHeaderFunctionSet* pFunc,
ScHeaderSelectionEngine* pEng );
~ScColBar();
-virtual SCCOLROWGetPos();
-virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo );
-virtual OUStringGetEntryText( SCCOLROW nEntryNo );
+virtual SCCOLROWGetPos() const;
+virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const;
+virtual OUStringGetEntryText( SCCOLROW nEntryNo ) const;
-virtual boolIsLayoutRTL(); // only for columns
+virtual boolIsLayoutRTL() const;
virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize );
virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd );
virtual voidSetMarking( bool bSet );
virtual voidSelectWindow();
-virtual boolIsDisabled();
-virtual boolResizeAllowed();
+virtual boolIsDisabled() const;
+virtual boolResizeAllowed() const;
virtual voidDrawInvert( long nDragPos );
@@ -73,29 +70,26 @@ public:
ScHeaderFunctionSet* pFunc,
ScHeaderSelectionEngine* pEng );
~ScRowBar();
-virtual SCCOLROWGetPos();
-virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo );
-virtual OUStringGetEntryText( SCCOLROW nEntryNo );
+virtual SCCOLROWGetPos() const;
+virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const;
+virtual OUStringGetEntryText( SCCOLROW nEntryNo ) const;
-virtual boolIsMirrored(); // only for columns
-virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns
+virtual boolIsMirrored() const;
+virtual SCROW GetHiddenCount( SCROW nEntryNo ) const;
virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize );
virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd );
virtual voidSetMarking( bool bSet );
virtual voidSelectWindow();
-virtual boolIsDisabled();
-virtual boolResizeAllowed();
+virtual boolIsDisabled() const;
+virtual boolResizeAllowed() const;
virtual voidDrawInvert( long nDragPos );
virtual OUStringGetDragHelp( long nVal );
};
-
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 3846cf8..9979af6 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -49,7 +49,7 @@ private:
SCCOLROWnMarkEnd;
boolbMarkRange;
-boolbDragging; // Change size
+boolbDragging; // Resizing
SCCOLROWnDragNo;
longnDragStart;
longnDragPos;
@@ -57,8 +57,8 @@ private:
boolbIgnoreMove;
-longGetScrPos( SCCOLROW nEntryNo );
-SCCOLROWGetMousePos( const MouseEvent rMEvt, bool rBorder );
+longGetScrPos( SCCOLROW nEntryNo ) const;
+SCCOLROWGetMousePos( const MouseEvent rMEvt, bool rBorder )
const;
boolIsSelectionAllowed(SCCOLROW nPos) const;
voidShowDragHelp();
@@ -80,21 +80,21 @@ protected:
// new methods
-virtual SCCOLROWGetPos() = 0; // current
position (Scrolling)
-virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // width /
height (Pixel)
-virtual OUString GetEntryText( SCCOLROW nEntryNo ) = 0;
+virtual SCCOLROW
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/hdrcont.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 0432f847bba2e2d074d72a9ff794d680e0f46785
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sun Nov 3 22:57:26 2013 -0200
minor cleanup in ScHeaderControl: nCount is always greater than 0
Change-Id: Ia50265e397704131dc948bc2bcbf80a442054b71
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/6538
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 93b5794..d536780 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -563,9 +563,9 @@ void ScHeaderControl::Paint( const Rectangle rRect )
SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent rMEvt, bool rBorder
) const
{
boolbFound = false;
-SCCOLROWnCount = 1;
SCCOLROWnPos = GetPos();
SCCOLROWnHitNo = nPos;
+SCCOLROWnEntryNo = 1 + nPos;
longnScrPos;
longnMousePos = bVertical ? rMEvt.GetPosPixel().Y() :
rMEvt.GetPosPixel().X();
longnDif;
@@ -579,22 +579,20 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent
rMEvt, bool rBorder )
nScrPos = GetScrPos( nPos ) - nLayoutSign;
do
{
-SCCOLROW nEntryNo = nCount + nPos;
-
if (nEntryNo nSize)
nScrPos = nEndPos + nLayoutSign;
else
nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //!
GetHiddenCount() ??
nDif = nMousePos - nScrPos;
-if (nDif = -2 nDif = 2 nCount 0)
+if (nDif = -2 nDif = 2)
{
bFound = true;
nHitNo=nEntryNo-1;
}
else if (nDif * nLayoutSign = 0 nEntryNo nSize)
nHitNo = nEntryNo;
-++nCount;
+++nEntryNo;
}
while ( nScrPos * nLayoutSign nEndPos * nLayoutSign nDif *
nLayoutSign 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/colrowba.hxx | 18 +-- sc/source/ui/inc/hdrcont.hxx | 31 +-- sc/source/ui/view/colrowba.cxx | 18 +-- sc/source/ui/view/hdrcont.cxx | 66 - 4 files changed, 66 insertions(+), 67 deletions(-) New commits: commit 8a82cacc668268be2fd5471fe4357d52c4372241 Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com Date: Mon Oct 28 21:15:56 2013 -0200 sal_Bool to bool in ScHeaderControl Change-Id: I8f5b9207f5634e3ff2c55d7cf9372c8caad0ed23 Reviewed-on: https://gerrit.libreoffice.org/6471 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index a9b2b14..2a0e976 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -44,21 +44,21 @@ public: virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual OUStringGetEntryText( SCCOLROW nEntryNo ); -virtual sal_BoolIsLayoutRTL(); // only for columns +virtual boolIsLayoutRTL(); // only for columns virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ); -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool bSet ); virtual voidSelectWindow(); -virtual sal_BoolIsDisabled(); -virtual sal_BoolResizeAllowed(); +virtual boolIsDisabled(); +virtual boolResizeAllowed(); virtual voidDrawInvert( long nDragPos ); virtual OUStringGetDragHelp( long nVal ); -sal_BoolUseNumericHeader() const; +boolUseNumericHeader() const; }; @@ -77,16 +77,16 @@ public: virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual OUStringGetEntryText( SCCOLROW nEntryNo ); -virtual sal_BoolIsMirrored(); // only for columns +virtual boolIsMirrored(); // only for columns virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ); -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool bSet ); virtual voidSelectWindow(); -virtual sal_BoolIsDisabled(); -virtual sal_BoolResizeAllowed(); +virtual boolIsDisabled(); +virtual boolResizeAllowed(); virtual voidDrawInvert( long nDragPos ); diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 31a4bf6..3846cf8 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -26,8 +26,7 @@ #define HDR_SIZE_OPTIMUM0x - -// Size of the sliders +// Size of the sliders #define HDR_SLIDERSIZE 2 class ScHeaderControl : public Window @@ -36,9 +35,9 @@ private: SelectionEngine*pSelEngine; FontaNormFont; FontaBoldFont; -sal_BoolbBoldSet; +boolbBoldSet; -sal_BoolbVertical; // Vertical = Row header +boolbVertical; // Vertical = Row header longnWidth; longnSmallWidth; @@ -48,18 +47,18 @@ private: SCCOLROWnMarkStart; SCCOLROWnMarkEnd; -sal_BoolbMarkRange; +boolbMarkRange; -sal_BoolbDragging; // Change size +boolbDragging; // Change size SCCOLROWnDragNo; longnDragStart; longnDragPos; -sal_BoolbDragMoved; +boolbDragMoved; -sal_BoolbIgnoreMove; +boolbIgnoreMove; longGetScrPos( SCCOLROW nEntryNo ); -SCCOLROWGetMousePos( const MouseEvent rMEvt, sal_Bool rBorder ); +SCCOLROWGetMousePos( const MouseEvent rMEvt, bool rBorder ); boolIsSelectionAllowed(SCCOLROW nPos) const; voidShowDragHelp(); @@ -86,16 +85,16 @@ protected: virtual OUString GetEntryText( SCCOLROW nEntryNo ) = 0; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); -virtual sal_BoolIsLayoutRTL(); -virtual sal_BoolIsMirrored(); +virtual bool IsLayoutRTL(); +virtual bool IsMirrored(); virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewWidth ) = 0; virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 58d8a11a1b44d5f07c43f96c7e4ab03dc549ef27
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Sat Sep 14 19:27:50 2013 -0300
Theme icons are loaded only once
With the theme icon cleaning commit
d5151ab592367fde7db03fce81e0b76776d18216, duplicated
icons (same icon for multiple actions) doesn't need to
be stored in different files. The file links.txt inside
the theme pack can handle filename redirections.
So, it keeps the theme pack smaller. However, the
duplicates keep being loaded, because they use different
names.
With this patch, the names of those duplicates are mapped
also when querying for the icons. This way, an icon is
loaded only once, saving RAM.
Change-Id: Ieb5b8424c1515f0033276bf314cdef02a4e01862
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/5943
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 4d549f0..1c67667 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -270,13 +270,12 @@ bool ImplImageTree::checkStyleCacheLookup(
bool ImplImageTree::iconCacheLookup(
OUString const name, bool localized, BitmapEx bitmap)
{
-IconCache::iterator i(m_iconCache.find(name));
+IconCache::iterator i(m_iconCache.find(getRealImageName(name)));
if (i != m_iconCache.end() i-second.first == localized) {
bitmap = i-second.second;
return true;
-} else {
-return false;
}
+return false;
}
bool ImplImageTree::find(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove unused icons after cleaning up Math zoom
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4117 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/4117/1 Remove unused icons after cleaning up Math zoom After commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d , these deleted icons are useless since other UNO commands are used instead: View050 - Zoom50Percent View100 - Zoom100Percent View200 - Zoom200Percent Adjust - ZoomOptimal FitInWindow - ZoomOptimal Sorry I forgot to remove then in that commit. Change-Id: I141f2c4ad2f63928efb15faa5f68bc9c6dabc144 Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com --- D icon-themes/crystal/cmd/lc_adjust.png D icon-themes/crystal/cmd/lc_view100.png D icon-themes/crystal/cmd/sc_adjust.png D icon-themes/crystal/cmd/sc_view100.png D icon-themes/galaxy/cmd/lc_adjust.png D icon-themes/galaxy/cmd/lc_view100.png D icon-themes/galaxy/cmd/sc_adjust.png D icon-themes/galaxy/cmd/sc_view100.png D icon-themes/hicontrast/cmd/lc_adjust.png D icon-themes/hicontrast/cmd/lc_view100.png D icon-themes/hicontrast/cmd/sc_adjust.png D icon-themes/hicontrast/cmd/sc_view100.png D icon-themes/human/cmd/lc_adjust.png D icon-themes/human/cmd/lc_view100.png D icon-themes/human/cmd/sc_adjust.png D icon-themes/human/cmd/sc_view100.png D icon-themes/industrial/cmd/lc_adjust.png D icon-themes/industrial/cmd/lc_view100.png D icon-themes/industrial/cmd/sc_adjust.png D icon-themes/industrial/cmd/sc_view100.png D icon-themes/oxygen/cmd/lc_adjust.png D icon-themes/oxygen/cmd/lc_view100.png D icon-themes/oxygen/cmd/sc_adjust.png D icon-themes/oxygen/cmd/sc_view100.png D icon-themes/tango/cmd/lc_adjust.png D icon-themes/tango/cmd/lc_view100.png D icon-themes/tango_testing/cmd/lc_view100.png 27 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icon-themes/crystal/cmd/lc_adjust.png b/icon-themes/crystal/cmd/lc_adjust.png deleted file mode 100644 index 5de38bf..000 --- a/icon-themes/crystal/cmd/lc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/crystal/cmd/lc_view100.png b/icon-themes/crystal/cmd/lc_view100.png deleted file mode 100644 index cc8ce15..000 --- a/icon-themes/crystal/cmd/lc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/crystal/cmd/sc_adjust.png b/icon-themes/crystal/cmd/sc_adjust.png deleted file mode 100644 index 9efbd54..000 --- a/icon-themes/crystal/cmd/sc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/crystal/cmd/sc_view100.png b/icon-themes/crystal/cmd/sc_view100.png deleted file mode 100644 index 8709d0a..000 --- a/icon-themes/crystal/cmd/sc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/galaxy/cmd/lc_adjust.png b/icon-themes/galaxy/cmd/lc_adjust.png deleted file mode 100644 index 228d958..000 --- a/icon-themes/galaxy/cmd/lc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/galaxy/cmd/lc_view100.png b/icon-themes/galaxy/cmd/lc_view100.png deleted file mode 100644 index 2f00d91..000 --- a/icon-themes/galaxy/cmd/lc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/galaxy/cmd/sc_adjust.png b/icon-themes/galaxy/cmd/sc_adjust.png deleted file mode 100644 index d9d1a66..000 --- a/icon-themes/galaxy/cmd/sc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/galaxy/cmd/sc_view100.png b/icon-themes/galaxy/cmd/sc_view100.png deleted file mode 100644 index bfd1a58..000 --- a/icon-themes/galaxy/cmd/sc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/hicontrast/cmd/lc_adjust.png b/icon-themes/hicontrast/cmd/lc_adjust.png deleted file mode 100644 index 60765d6..000 --- a/icon-themes/hicontrast/cmd/lc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/hicontrast/cmd/lc_view100.png b/icon-themes/hicontrast/cmd/lc_view100.png deleted file mode 100644 index 33af72d..000 --- a/icon-themes/hicontrast/cmd/lc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/hicontrast/cmd/sc_adjust.png b/icon-themes/hicontrast/cmd/sc_adjust.png deleted file mode 100644 index fdaabf5..000 --- a/icon-themes/hicontrast/cmd/sc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/hicontrast/cmd/sc_view100.png b/icon-themes/hicontrast/cmd/sc_view100.png deleted file mode 100644 index 2254149..000 --- a/icon-themes/hicontrast/cmd/sc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/human/cmd/lc_adjust.png b/icon-themes/human/cmd/lc_adjust.png deleted file mode 100644 index 4beea80..000 --- a/icon-themes/human/cmd/lc_adjust.png +++ /dev/null Binary files differ diff --git a/icon-themes/human/cmd/lc_view100.png b/icon-themes/human/cmd/lc_view100.png deleted file mode 100644 index 2c52084..000 --- a/icon-themes/human/cmd/lc_view100.png +++ /dev/null Binary files differ diff --git a/icon-themes/human/cmd/sc_adjust.png b/icon-themes/human/cmd
[Libreoffice-commits] core.git: officecfg/registry sfx2/sdi sfx2/source starmath/inc starmath/qa starmath/sdi starmath/source starmath/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2
sfx2/sdi/appslots.sdi|8
sfx2/source/appl/appserv.cxx | 16 +
starmath/inc/starmath.hrc|5
starmath/qa/cppunit/test_starmath.cxx|9
starmath/sdi/smath.sdi | 124
--
starmath/sdi/smslots.sdi | 26 --
starmath/source/smres.src|8
starmath/source/view.cxx | 21 -
starmath/uiconfig/smath/toolbar/toolbar.xml |6
10 files changed, 35 insertions(+), 190 deletions(-)
New commits:
commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Tue May 28 11:22:05 2013 -0300
Clean zoom redundances in Math and fix fdo#55929
Zoom can be handled by sfx2 in many ways:
- 50%, 75%, 100%, 150%, 200%
- Optimal view (fit in window)
- Entire page
- Page width
The math module was doing the first two by itself. Remove it.
Strange enough, state methods for zoom interface definitions on
sfx2's appslots.sdi were needed. I thought 'Container' property
in sfx.sdi should do the job. It seems to do nothing, though.
(The zoom should be disabled only if the object is an OLE/Container).
The Help-Ids from pop-up menu in Math/Formula were kept, because
they doesn't exist in sfx2.
Change-Id: Ie1ae413780551b34aa36b338f9a9df79a198319c
Reviewed-on: https://gerrit.libreoffice.org/4076
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 46ed65a..bbed900 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1773,7 +1773,7 @@
/node
node oor:name=.uno:ZoomOptimal oor:op=replace
prop oor:name=Label oor:type=xs:string
- value xml:lang=en-USOptimal/value
+ value xml:lang=en-USOptimal view/value
/prop
prop oor:name=Properties oor:type=xs:int
value1/value
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index aa1da36..320a75e 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -182,34 +182,42 @@ interface Application
SID_ZOOM_ENTIRE_PAGE
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_OPTIMAL
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_PAGE_WIDTH
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_50_PERCENT
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_75_PERCENT
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_100_PERCENT
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_150_PERCENT
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ZOOM_200_PERCENT
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_HELP_TUTORIALS
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 80a380f..825125d 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -827,6 +827,22 @@ void SfxApplication::MiscState_Impl(SfxItemSet rSet)
}
break;
+case SID_ZOOM_50_PERCENT:
+case SID_ZOOM_75_PERCENT:
+case SID_ZOOM_100_PERCENT:
+case SID_ZOOM_150_PERCENT:
+case SID_ZOOM_200_PERCENT:
+case SID_ZOOM_OPTIMAL:
+case SID_ZOOM_ENTIRE_PAGE:
+case SID_ZOOM_PAGE_WIDTH:
+{
+const SfxPoolItem *pItem;
+SfxItemState aState =
SfxViewFrame::Current()-GetDispatcher()-QueryState(SID_ATTR_ZOOM, pItem);
+if ( aState == SFX_ITEM_DISABLED )
+rSet.DisableItem( nWhich );
+}
+break;
+
default:
break;
}
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f233fa4..3b2e902 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -31,13 +31,9 @@
#define SID_PREVMARK
[PATCH] Clean zoom redundances in Math and fix fdo#55929
index 7104423..00e9875 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -176,21 +176,6 @@
ExecMethod = Execute ;
StateMethod = GetState ;
]
-SID_VIEW050 //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-SID_VIEW100 //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-SID_VIEW200 //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
SID_ZOOMIN //idlpp ole : no , status : no
[
ExecMethod = Execute ;
@@ -202,17 +187,6 @@
StateMethod = GetState ;
]
SID_DRAW //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-SID_ADJUST //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-//idlpp kein Menueeintrag , also keine Texte
-SID_FITINWINDOW //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 805b290..b5a776e 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -838,19 +838,19 @@
{
MenuItem
{
-Identifier = SID_VIEW050 ;
+Identifier = SID_ZOOM_50_PERCENT;
HelpId = CMD_SID_VIEW050 ;
Text [ en-US ] = ~View 50% ;
};
MenuItem
{
-Identifier = SID_VIEW100 ;
+Identifier = SID_ZOOM_100_PERCENT ;
HelpId = CMD_SID_VIEW100 ;
Text [ en-US ] = View ~100% ;
};
MenuItem
{
-Identifier = SID_VIEW200 ;
+Identifier = SID_ZOOM_200_PERCENT ;
HelpId = CMD_SID_VIEW200 ;
Text [ en-US ] = View ~200% ;
};
@@ -868,7 +868,7 @@
};
MenuItem
{
-Identifier = SID_ADJUST ;
+Identifier = SID_ZOOM_OPTIMAL ;
HelpId = CMD_SID_ADJUST ;
Text [ en-US ] = ~Display All ;
};
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d144dde..e6179b8 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1569,21 +1569,8 @@
}
break;
-case SID_ADJUST:
-case SID_FITINWINDOW:
+case SID_ZOOM_OPTIMAL:
aGraphic.ZoomToFitInWindow();
-break;
-
-case SID_VIEW050:
-aGraphic.SetZoom(50);
-break;
-
-case SID_VIEW100:
-aGraphic.SetZoom(100);
-break;
-
-case SID_VIEW200:
-aGraphic.SetZoom(200);
break;
case SID_ZOOMIN:
@@ -1925,13 +1912,9 @@
case SID_ATTR_ZOOM:
rSet.Put(SvxZoomItem( SVX_ZOOM_PERCENT, aGraphic.GetZoom()));
/* no break here */
-case SID_VIEW050:
-case SID_VIEW100:
-case SID_VIEW200:
-case SID_ADJUST:
case SID_ZOOMIN:
case SID_ZOOMOUT:
-case SID_FITINWINDOW:
+case SID_ZOOM_OPTIMAL:
if ( GetViewFrame()-GetFrame().IsInPlace() )
rSet.DisableItem( nWh );
break;
diff --git a/starmath/uiconfig/smath/toolbar/toolbar.xml
b/starmath/uiconfig/smath/toolbar/toolbar.xml
index 7ac3103..ae74d5e 100644
--- a/starmath/uiconfig/smath/toolbar/toolbar.xml
+++ b/starmath/uiconfig/smath/toolbar/toolbar.xml
@@ -20,10 +20,10 @@
toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar;
xmlns:xlink=http://www.w3.org/1999/xlink; toolbar:id=toolbar
toolbar:toolbaritem xlink:href=.uno:ZoomIn toolbar:text=/
toolbar:toolbaritem xlink:href=.uno:ZoomOut toolbar:text=/
- toolbar:toolbaritem xlink:href=.uno:View100 toolbar:text=/
- toolbar:toolbaritem xlink:href=.uno:Adjust toolbar:text=/
+ toolbar:toolbaritem xlink:href=.uno:Zoom100Percent toolbar:text=/
+ toolbar:toolbaritem xlink:href=.uno:ZoomOptimal toolbar:text=/
toolbar:toolbarseparator/
toolbar:toolbaritem xlink:href=.uno:Draw toolbar:text=/
toolbar:toolbaritem xlink:href=.uno:FormelCursor toolbar:text=/
toolbar:toolbaritem xlink:href=.uno:SymbolCatalogue toolbar:text=/
-/toolbar:toolbar
\ No newline at end of file
+/toolbar:toolbar
--
To view, visit https://gerrit.libreoffice.org/4076
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1ae413780551b34aa36b338f9a9df79a198319c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx | 65 +---
1 file changed, 22 insertions(+), 43 deletions(-)
New commits:
commit a2c9d4f8bbde97f175bae4df771273a61251f402
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Tue May 14 20:16:02 2013 -0300
Little cleanup in image loader internal functions
Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/3950
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 6e449de..ea7d7cf 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -64,13 +64,13 @@
namespace {
-OUString createPath(
+static OUString createPath(
OUString const name, sal_Int32 pos, OUString const locale)
{
return name.copy(0, pos + 1) + locale + name.copy(pos);
}
-boost::shared_ptr SvStream wrapFile(osl::File file)
+static boost::shared_ptr SvStream wrapFile(osl::File file)
{
// This could use SvInputStream instead if that did not have a broken
// SeekPos implementation for an XInputStream that is not also XSeekable
@@ -90,22 +90,7 @@ boost::shared_ptr SvStream wrapFile(osl::File file)
return s;
}
-void loadFromFile(
-osl::File file,
-OUString const path, BitmapEx bitmap)
-{
-boost::shared_ptr SvStream s(wrapFile(file));
-if (path.endsWith(.png))
-{
-vcl::PNGReader aPNGReader( *s );
-aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
-} else {
-*s bitmap;
-}
-}
-
-boost::shared_ptr SvStream wrapStream(
+static boost::shared_ptr SvStream wrapStream(
css::uno::Reference css::io::XInputStream const stream)
{
// This could use SvInputStream instead if that did not have a broken
@@ -127,18 +112,17 @@ boost::shared_ptr SvStream wrapStream(
return s;
}
-void loadFromStream(
-css::uno::Reference css::io::XInputStream const stream,
-OUString const path, BitmapEx bitmap)
+static void loadImageFromStream(
+boost::shared_ptr SvStream pStream,
+OUString const rPath, BitmapEx rBitmap)
{
-boost::shared_ptr SvStream s(wrapStream(stream));
-if (path.endsWith(.png))
+if (rPath.endsWith(.png))
{
-vcl::PNGReader aPNGReader( *s );
+vcl::PNGReader aPNGReader( *pStream );
aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
+rBitmap = aPNGReader.Read();
} else {
-*s bitmap;
+*pStream rBitmap;
}
}
@@ -271,27 +255,22 @@ void ImplImageTree::setStyle(OUString const style) {
void ImplImageTree::resetPaths() {
m_paths.clear();
+
+OUString url( $BRAND_BASE_DIR/share/config/ );
+rtl::Bootstrap::expandMacros(url);
+if ( m_style != default )
{
-OUString url(
-$BRAND_BASE_DIR/share/config);
-rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
bool ok = u.Append(images_ + m_style, INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
-m_paths.push_back(
-std::make_pair(
-u.GetMainURL(INetURLObject::NO_DECODE),
-css::uno::Reference css::container::XNameAccess ()));
-}
-if ( m_style == default )
-{
-OUString url( $BRAND_BASE_DIR/share/config/images);
-rtl::Bootstrap::expandMacros(url);
-m_paths.push_back(
-std::make_pair(
-url, css::uno::Reference css::container::XNameAccess ()));
+url = u.GetMainURL(INetURLObject::NO_DECODE);
}
+else
+url += images;
+m_paths.push_back(
+std::make_pair(
+url, css::uno::Reference css::container::XNameAccess ()));
}
bool ImplImageTree::checkStyleCacheLookup(
@@ -329,7 +308,7 @@ bool ImplImageTree::find(
{
osl::File file(i-first + / + *j);
if (file.open(osl_File_OpenFlag_Read) ==
::osl::FileBase::E_None) {
-loadFromFile(file, *j, bitmap);
+loadImageFromStream( wrapFile(file), *j, bitmap );
file.close();
return true;
}
@@ -361,7 +340,7 @@ bool ImplImageTree::find(
css::uno::Reference css::io::XInputStream s;
bool ok = i-second-getByName(*j) = s;
OSL_ASSERT(ok); (void) ok;
-loadFromStream(s, *j, bitmap);
+loadImageFromStream( wrapStream(s), *j, bitmap );
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-1-branch-point'
Tag 'libreoffice-4-1-branch-point' created by Petr Mladek pmla...@suse.cz at 2013-05-21 11:42 -0700 Tag libreoffice-4-1-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRm0+lAAoJEPQ0oe+v7q6jRW0P/j27uSMEZvtUvncQTs2cgxNb f+F07hSYINR6X03DerTaqozW1oBAMB0mc4mLCBmlu0aHP5Acor8fCQQ4KOm9xZl/ B7ybtrIXfFzvPgVG3pb/mQmBveg5HQqHCqBT+v9n+NtOxcl6ST6nB+jtIH2hOXGL UAXib+UXG5mVan4es5OXZJEEr+TQo8l4XAzBR4PnGaLE/0jhlnBpyvHMn+lfiskO jTds1ZR/j3P+6fSVLMKTGXl0pppJrKp8p9ZUXYJBpW20Gk1Gnj2i8nSSL4gaaGcv P7QcgmAZ3SV2YnAHi4O2iFP50/dBvnaf4xC2Avec0hCN3hAcLa49hKefH2ESxNqm ctONYVJqzrOQFOKb6IVh+C3wZ0wE3p1Gz/8QFwqjJEAmXqW6fM1uDG8kQsqB/gr0 ga3xKrWYCoCFkSUyPknr6IvhOBABLVUhaKijlUAMXMWVWiNKvsTTwbUIXITecL4h gx2HrOQ/z9/EXbkfA0L27P5YRawJREE3Wa+Etyj7Y8oaE9QufNDdxsF41e/jw125 UUMwcM8Lvlo82bTbD9eI4YIvgBlDZDHENYgvt4N8mXXUTeLYrJEtheNeI9AWoPbK YeAVvRhz9lhIXabaAPgN5y8WpSE3Fmj3j5vCIRUCZQ3enJPyHPpvXwfYloJhxp2l r8bM8+4s9oXVVpbcxau7 =48Vr -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-10062: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impimagetree.hxx| 11 +---
vcl/source/gdi/impimagetree.cxx | 107 +---
2 files changed, 53 insertions(+), 65 deletions(-)
New commits:
commit 330ce827f2fbc6499eddf2084f8401fcdee5103b
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Wed May 15 01:11:52 2013 -0300
Loader's ImageTree doesn't store multiple image paths anymore
Change-Id: Idd13039a76c46bfccad5f54e3357dde952508211
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/3951
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index f42a039..0dc3110 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -65,11 +65,10 @@ private:
OUString const name, OUString const style,
BitmapEx bitmap, bool localized);
-typedef std::list
-std::pair
-OUString,
-com::sun::star::uno::Reference
-com::sun::star::container::XNameAccessPaths;
+typedef std::pair
+OUString,
+com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess Path;
typedef boost::unordered_map
OUString, bool, OUStringHash CheckStyleCache;
@@ -77,7 +76,7 @@ private:
OUString, std::pair bool, BitmapEx , OUStringHash IconCache;
OUString m_style;
-Paths m_paths;
+Path m_path;
CheckStyleCache m_checkStyleCache;
IconCache m_iconCache;
bool m_cacheIcons;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index ea7d7cf..935b8cf 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -145,23 +145,21 @@ bool ImplImageTree::checkStyle(OUString const style)
setStyle(style);
exists = false;
-for (Paths::iterator i(m_paths.begin()); i != m_paths.end() !exists;
++i) {
-OUString aURL = i-first;
+OUString aURL = m_path.first;
-osl::File aZip(aURL + .zip);
-if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
-aZip.close();
-exists = true;
-}
+osl::File aZip(aURL + .zip);
+if (aZip.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None) {
+aZip.close();
+exists = true;
+}
-osl::Directory aLookaside(aURL);
-if (aLookaside.open() == ::osl::FileBase::E_None) {
-aLookaside.close();
-exists = true;
-m_cacheIcons = false;
-} else {
-m_cacheIcons = true;
-}
+osl::Directory aLookaside(aURL);
+if (aLookaside.open() == ::osl::FileBase::E_None) {
+aLookaside.close();
+exists = true;
+m_cacheIcons = false;
+} else {
+m_cacheIcons = true;
}
m_checkStyleCache[style] = exists;
return exists;
@@ -239,7 +237,6 @@ bool ImplImageTree::doLoadImage(
void ImplImageTree::shutDown() {
m_style = OUString();
// for safety; empty m_style means not initialized
-m_paths.clear();
m_iconCache.clear();
m_checkStyleCache.clear();
}
@@ -254,8 +251,6 @@ void ImplImageTree::setStyle(OUString const style) {
}
void ImplImageTree::resetPaths() {
-m_paths.clear();
-
OUString url( $BRAND_BASE_DIR/share/config/ );
rtl::Bootstrap::expandMacros(url);
if ( m_style != default )
@@ -268,9 +263,8 @@ void ImplImageTree::resetPaths() {
}
else
url += images;
-m_paths.push_back(
-std::make_pair(
-url, css::uno::Reference css::container::XNameAccess ()));
+m_path = std::make_pair(
+url, css::uno::Reference css::container::XNameAccess ());
}
bool ImplImageTree::checkStyleCacheLookup(
@@ -301,50 +295,45 @@ bool ImplImageTree::find(
std::vector OUString const paths, BitmapEx bitmap)
{
if (!m_cacheIcons) {
-for (Paths::iterator i(m_paths.begin()); i != m_paths.end(); ++i) {
-for (std::vector OUString ::const_reverse_iterator j(
- paths.rbegin());
- j != paths.rend(); ++j)
-{
-osl::File file(i-first + / + *j);
-if (file.open(osl_File_OpenFlag_Read) ==
::osl::FileBase::E_None) {
-loadImageFromStream( wrapFile(file), *j, bitmap );
-file.close();
-return true;
-}
-}
-}
-}
-
-for (Paths::iterator i(m_paths.begin()); i != m_paths.end();) {
-if (!i-second.is()) {
-try {
-i-second.set(
-css::packages::zip::ZipFileAccess::createWithURL(
- comphelper::getProcessComponentContext(),
- i-first + .zip),
-css::uno::UNO_QUERY_THROW);
-} catch (css
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impimagetree.hxx|2 -- vcl/source/gdi/impimagetree.cxx | 13 - 2 files changed, 15 deletions(-) New commits: commit e8c9a6af25a7ff476e33ad239b70414168aabe3a Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com Date: Thu May 16 23:28:04 2013 -0300 Removal of includes not needed anymore Change-Id: I5dccad8629a59e92dc2864e2b3630732a631ee96 Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com Reviewed-on: https://gerrit.libreoffice.org/3952 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 0dc3110..d22e770 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -22,8 +22,6 @@ #include sal/config.h -#include list -#include utility #include vector #include boost/unordered_map.hpp diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 935b8cf..bb0013f 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -20,11 +20,6 @@ #include sal/config.h -#include list -#include memory -#include utility -#include vector -#include boost/unordered_map.hpp #include boost/shared_ptr.hpp #include com/sun/star/container/XNameAccess.hpp @@ -34,7 +29,6 @@ #include com/sun/star/packages/zip/ZipFileAccess.hpp #include com/sun/star/uno/Any.hxx #include com/sun/star/uno/Exception.hpp -#include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/RuntimeException.hpp #include com/sun/star/uno/Sequence.hxx @@ -44,13 +38,6 @@ #include osl/diagnose.h #include rtl/bootstrap.hxx -#include rtl/string.h -#include rtl/textenc.h -#include rtl/ustrbuf.hxx -#include rtl/ustring.h -#include rtl/ustring.hxx - -#include sal/types.h #include tools/stream.hxx #include tools/urlobj.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impimagetree.hxx|7 +++
vcl/source/gdi/impimagetree.cxx | 88 ++--
2 files changed, 92 insertions(+), 3 deletions(-)
New commits:
commit d5151ab592367fde7db03fce81e0b76776d18216
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Wed May 15 08:05:05 2013 -0300
Allow 'textual links' on icon theme packages
This would allow use of better icon names ( fdo#30425 ) and
minimizes space size needed by reuses of same icons bitmaps
with different filenames.
Icon packages shoud have a file named links.txt on root folder
in order to achieve that. It binds a name of a 'virtual' file to
an existing one, to avoid duplicates.
This file should contain one or more lines like this:
path/for/fakefile_that_reuse_a_bitmap.png path/for/existing_one.png
Implemented as discussed in:
http://lists.freedesktop.org/archives/libreoffice/2013-April/049650.html
Change-Id: Ia65a1ba18f93297fae47fa520104821f6f336694
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/3953
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index d22e770..11c003e 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -72,12 +72,15 @@ private:
OUString, bool, OUStringHash CheckStyleCache;
typedef boost::unordered_map
OUString, std::pair bool, BitmapEx , OUStringHash IconCache;
+typedef boost::unordered_map
+OUString, OUString, OUStringHash IconLinkCache;
OUString m_style;
Path m_path;
CheckStyleCache m_checkStyleCache;
IconCache m_iconCache;
bool m_cacheIcons;
+IconLinkCache m_iconLinkCache;
void setStyle(OUString const style );
@@ -87,6 +90,10 @@ private:
bool iconCacheLookup( OUString const name, bool localized, BitmapEx
bitmap );
bool find(std::vector OUString const paths, BitmapEx bitmap );
+
+void loadImageLinks();
+void parseLinkFile(boost::shared_ptr SvStream stream);
+OUString const getRealImageName(OUString const name);
};
typedef salhelper::SingletonRef ImplImageTree ImplImageTreeSingletonRef;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index bb0013f..857a080 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -194,7 +194,7 @@ bool ImplImageTree::doLoadImage(
bitmap.SetEmpty();
}
std::vector OUString paths;
-paths.push_back(name);
+paths.push_back(getRealImageName(name));
if (localized) {
sal_Int32 pos = name.lastIndexOf('/');
if (pos != -1) {
@@ -203,7 +203,7 @@ bool ImplImageTree::doLoadImage(
for (std::vector OUString ::const_reverse_iterator it(
aFallbacks.rbegin());
it != aFallbacks.rend(); ++it)
{
-paths.push_back(createPath(name, pos, *it));
+paths.push_back( getRealImageName( createPath(name, pos, *it)
) );
}
}
}
@@ -226,6 +226,7 @@ void ImplImageTree::shutDown() {
// for safety; empty m_style means not initialized
m_iconCache.clear();
m_checkStyleCache.clear();
+m_iconLinkCache.clear();
}
void ImplImageTree::setStyle(OUString const style) {
@@ -234,6 +235,8 @@ void ImplImageTree::setStyle(OUString const style) {
m_style = style;
resetPaths();
m_iconCache.clear();
+m_iconLinkCache.clear();
+loadImageLinks();
}
}
@@ -282,7 +285,8 @@ bool ImplImageTree::find(
std::vector OUString const paths, BitmapEx bitmap)
{
if (!m_cacheIcons) {
-for (std::vector OUString ::const_reverse_iterator j(paths.rbegin());
+for (std::vector OUString ::const_reverse_iterator j(
+ paths.rbegin());
j != paths.rend(); ++j)
{
osl::File file(m_path.first + / + *j);
@@ -325,4 +329,82 @@ bool ImplImageTree::find(
return false;
}
+void ImplImageTree::loadImageLinks()
+{
+const OUString aLinkFilename(links.txt);
+
+if (!m_cacheIcons)
+{
+osl::File file(m_path.first + / + aLinkFilename);
+if (file.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None)
+{
+parseLinkFile( wrapFile(file) );
+file.close();
+return;
+}
+}
+
+if ( !m_path.second.is() )
+{
+css::uno::Sequence css::uno::Any args(1);
+args[0] = m_path.first + .zip;
+try
+{
+m_path.second.set(
+
comphelper::getProcessServiceFactory()-createInstanceWithArguments(
+OUString( com.sun.star.packages.zip.ZipFileAccess),
+args),
+css::uno::UNO_QUERY_THROW
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impimagetree.cxx | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit e673655ba784bd2993fb4e364c042fbc0e938d2d
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date: Mon May 13 21:42:31 2013 -0300
Make some uses of OUStrings a little more readable
Change-Id: I2e85fa39abbff86918464aae67b4b9eacd3bf7a4
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/3949
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index a2cab8b..6e449de 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -67,10 +67,7 @@ namespace {
OUString createPath(
OUString const name, sal_Int32 pos, OUString const locale)
{
-OUStringBuffer b(name.copy(0, pos + 1));
-b.append(locale);
-b.append(name.copy(pos));
-return b.makeStringAndClear();
+return name.copy(0, pos + 1) + locale + name.copy(pos);
}
boost::shared_ptr SvStream wrapFile(osl::File file)
@@ -280,10 +277,7 @@ void ImplImageTree::resetPaths() {
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
-OUStringBuffer b;
-b.appendAscii(images_);
-b.append(m_style);
-bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
+bool ok = u.Append(images_ + m_style, INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
m_paths.push_back(
std::make_pair(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Make some uses of OUStrings a little more readable
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3949
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3949/1
Make some uses of OUStrings a little more readable
Change-Id: I2e85fa39abbff86918464aae67b4b9eacd3bf7a4
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
---
M vcl/source/gdi/impimagetree.cxx
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 7a2fbdd..bcdfd01 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -66,10 +66,7 @@
OUString createPath(
OUString const name, sal_Int32 pos, OUString const locale)
{
-OUStringBuffer b(name.copy(0, pos + 1));
-b.append(locale);
-b.append(name.copy(pos));
-return b.makeStringAndClear();
+return name.copy(0, pos + 1) + locale + name.copy(pos);
}
boost::shared_ptr SvStream wrapFile(osl::File file)
@@ -279,10 +276,7 @@
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
-OUStringBuffer b;
-b.appendAscii(images_);
-b.append(m_style);
-bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
+bool ok = u.Append(images_ + m_style, INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
m_paths.push_back(
std::make_pair(
--
To view, visit https://gerrit.libreoffice.org/3949
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e85fa39abbff86918464aae67b4b9eacd3bf7a4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Little cleanup in image loader internal functions
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3950
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3950/1
Little cleanup in image loader internal functions
Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
---
M vcl/source/gdi/impimagetree.cxx
1 file changed, 22 insertions(+), 43 deletions(-)
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index bcdfd01..97fa471 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -63,13 +63,13 @@
namespace {
-OUString createPath(
+static OUString createPath(
OUString const name, sal_Int32 pos, OUString const locale)
{
return name.copy(0, pos + 1) + locale + name.copy(pos);
}
-boost::shared_ptr SvStream wrapFile(osl::File file)
+static boost::shared_ptr SvStream wrapFile(osl::File file)
{
// This could use SvInputStream instead if that did not have a broken
// SeekPos implementation for an XInputStream that is not also XSeekable
@@ -89,22 +89,7 @@
return s;
}
-void loadFromFile(
-osl::File file,
-OUString const path, BitmapEx bitmap)
-{
-boost::shared_ptr SvStream s(wrapFile(file));
-if (path.endsWith(.png))
-{
-vcl::PNGReader aPNGReader( *s );
-aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
-} else {
-*s bitmap;
-}
-}
-
-boost::shared_ptr SvStream wrapStream(
+static boost::shared_ptr SvStream wrapStream(
css::uno::Reference css::io::XInputStream const stream)
{
// This could use SvInputStream instead if that did not have a broken
@@ -126,18 +111,17 @@
return s;
}
-void loadFromStream(
-css::uno::Reference css::io::XInputStream const stream,
-OUString const path, BitmapEx bitmap)
+static void loadImageFromStream(
+boost::shared_ptr SvStream pStream,
+OUString const rPath, BitmapEx rBitmap)
{
-boost::shared_ptr SvStream s(wrapStream(stream));
-if (path.endsWith(.png))
+if (rPath.endsWith(.png))
{
-vcl::PNGReader aPNGReader( *s );
+vcl::PNGReader aPNGReader( *pStream );
aPNGReader.SetIgnoreGammaChunk( sal_True );
-bitmap = aPNGReader.Read();
+rBitmap = aPNGReader.Read();
} else {
-*s bitmap;
+*pStream rBitmap;
}
}
@@ -270,27 +254,22 @@
void ImplImageTree::resetPaths() {
m_paths.clear();
+
+OUString url( $BRAND_BASE_DIR/share/config/ );
+rtl::Bootstrap::expandMacros(url);
+if ( m_style != default )
{
-OUString url(
-$BRAND_BASE_DIR/share/config);
-rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
bool ok = u.Append(images_ + m_style, INetURLObject::ENCODE_ALL);
OSL_ASSERT(ok); (void) ok;
-m_paths.push_back(
-std::make_pair(
-u.GetMainURL(INetURLObject::NO_DECODE),
-css::uno::Reference css::container::XNameAccess ()));
+url = u.GetMainURL(INetURLObject::NO_DECODE);
}
-if ( m_style == default )
-{
-OUString url( $BRAND_BASE_DIR/share/config/images);
-rtl::Bootstrap::expandMacros(url);
-m_paths.push_back(
-std::make_pair(
-url, css::uno::Reference css::container::XNameAccess ()));
-}
+else
+url += images;
+m_paths.push_back(
+std::make_pair(
+url, css::uno::Reference css::container::XNameAccess ()));
}
bool ImplImageTree::checkStyleCacheLookup(
@@ -328,7 +307,7 @@
{
osl::File file(i-first + / + *j);
if (file.open(osl_File_OpenFlag_Read) ==
::osl::FileBase::E_None) {
-loadFromFile(file, *j, bitmap);
+loadImageFromStream( wrapFile(file), *j, bitmap );
file.close();
return true;
}
@@ -362,7 +341,7 @@
css::uno::Reference css::io::XInputStream s;
bool ok = i-second-getByName(*j) = s;
OSL_ASSERT(ok); (void) ok;
-loadFromStream(s, *j, bitmap);
+loadImageFromStream( wrapStream(s), *j, bitmap );
return true;
}
}
--
To view, visit https://gerrit.libreoffice.org/3950
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removal of includes not needed anymore
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3952 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3952/1 Removal of includes not needed anymore Change-Id: I5dccad8629a59e92dc2864e2b3630732a631ee96 Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com --- M vcl/inc/impimagetree.hxx M vcl/source/gdi/impimagetree.cxx 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 0dc3110..d22e770 100644 --- a/vcl/inc/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx @@ -22,8 +22,6 @@ #include sal/config.h -#include list -#include utility #include vector #include boost/unordered_map.hpp diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 86e2f22..fe252fa 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -20,11 +20,6 @@ #include sal/config.h -#include list -#include memory -#include utility -#include vector -#include boost/unordered_map.hpp #include boost/shared_ptr.hpp #include com/sun/star/container/XNameAccess.hpp @@ -33,7 +28,6 @@ #include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/uno/Any.hxx #include com/sun/star/uno/Exception.hpp -#include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/RuntimeException.hpp #include com/sun/star/uno/Sequence.hxx @@ -43,13 +37,6 @@ #include osl/diagnose.h #include rtl/bootstrap.hxx -#include rtl/string.h -#include rtl/textenc.h -#include rtl/ustrbuf.hxx -#include rtl/ustring.h -#include rtl/ustring.hxx - -#include sal/types.h #include tools/stream.hxx #include tools/urlobj.hxx -- To view, visit https://gerrit.libreoffice.org/3952 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5dccad8629a59e92dc2864e2b3630732a631ee96 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rodolfo Ribeiro Gomes l...@rodolfo.eng.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Allow 'textual links' on icon theme packages
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3953
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3953/1
Allow 'textual links' on icon theme packages
This would allow use of better icon names ( fdo#30425 ) and
minimizes space size needed by reuses of same icons bitmaps
with different filenames.
Icon packages shoud have a file named links.txt on root folder
in order to achieve that. It binds a name of a 'virtual' file to
an existing one, to avoid duplicates.
This file should contain one or more lines like this:
path/for/fakefile_that_reuse_a_bitmap.png path/for/existing_one.png
Implemented as discussed in:
http://lists.freedesktop.org/archives/libreoffice/2013-April/049650.html
Change-Id: Ia65a1ba18f93297fae47fa520104821f6f336694
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
---
M vcl/inc/impimagetree.hxx
M vcl/source/gdi/impimagetree.cxx
2 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index d22e770..11c003e 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -72,12 +72,15 @@
OUString, bool, OUStringHash CheckStyleCache;
typedef boost::unordered_map
OUString, std::pair bool, BitmapEx , OUStringHash IconCache;
+typedef boost::unordered_map
+OUString, OUString, OUStringHash IconLinkCache;
OUString m_style;
Path m_path;
CheckStyleCache m_checkStyleCache;
IconCache m_iconCache;
bool m_cacheIcons;
+IconLinkCache m_iconLinkCache;
void setStyle(OUString const style );
@@ -87,6 +90,10 @@
bool iconCacheLookup( OUString const name, bool localized, BitmapEx
bitmap );
bool find(std::vector OUString const paths, BitmapEx bitmap );
+
+void loadImageLinks();
+void parseLinkFile(boost::shared_ptr SvStream stream);
+OUString const getRealImageName(OUString const name);
};
typedef salhelper::SingletonRef ImplImageTree ImplImageTreeSingletonRef;
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index fe252fa..b8426e7 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -193,7 +193,7 @@
bitmap.SetEmpty();
}
std::vector OUString paths;
-paths.push_back(name);
+paths.push_back(getRealImageName(name));
if (localized) {
sal_Int32 pos = name.lastIndexOf('/');
if (pos != -1) {
@@ -202,7 +202,7 @@
for (std::vector OUString ::const_reverse_iterator it(
aFallbacks.rbegin());
it != aFallbacks.rend(); ++it)
{
-paths.push_back(createPath(name, pos, *it));
+paths.push_back( getRealImageName( createPath(name, pos, *it)
) );
}
}
}
@@ -225,6 +225,7 @@
// for safety; empty m_style means not initialized
m_iconCache.clear();
m_checkStyleCache.clear();
+m_iconLinkCache.clear();
}
void ImplImageTree::setStyle(OUString const style) {
@@ -233,6 +234,8 @@
m_style = style;
resetPaths();
m_iconCache.clear();
+m_iconLinkCache.clear();
+loadImageLinks();
}
}
@@ -281,7 +284,8 @@
std::vector OUString const paths, BitmapEx bitmap)
{
if (!m_cacheIcons) {
-for (std::vector OUString ::const_reverse_iterator j(paths.rbegin());
+for (std::vector OUString ::const_reverse_iterator j(
+ paths.rbegin());
j != paths.rend(); ++j)
{
osl::File file(m_path.first + / + *j);
@@ -324,4 +328,82 @@
return false;
}
+void ImplImageTree::loadImageLinks()
+{
+const OUString aLinkFilename(links.txt);
+
+if (!m_cacheIcons)
+{
+osl::File file(m_path.first + / + aLinkFilename);
+if (file.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None)
+{
+parseLinkFile( wrapFile(file) );
+file.close();
+return;
+}
+}
+
+if ( !m_path.second.is() )
+{
+css::uno::Sequence css::uno::Any args(1);
+args[0] = m_path.first + .zip;
+try
+{
+m_path.second.set(
+
comphelper::getProcessServiceFactory()-createInstanceWithArguments(
+OUString( com.sun.star.packages.zip.ZipFileAccess),
+args),
+css::uno::UNO_QUERY_THROW);
+}
+catch (css::uno::RuntimeException )
+{
+throw;
+}
+catch (const css::uno::Exception e)
+{
+SAL_INFO(vcl, ImplImageTree::find exception
+ e.Message for m_path.first);
+return;
+}
+}
+if ( m_path.second-hasByName(aLinkFilename) )
+{
+css::uno::Reference css::io::XInputStream s;
+bool ok = m_path.second-getByName(aLinkFilename) = s;
+OSL_ASSERT(ok
