[Libreoffice-commits] core.git: 6 commits - basctl/source basic/source cui/source offapi/com offapi/UnoApi_offapi.mk sw/inc sw/source xmloff/source

[Noel Grandin]

 basctl/source/dlged/dlged.cxx  |9 -
 basic/source/uno/dlgcont.cxx   |   47 -
 cui/source/customize/cfgutil.cxx   |5 -
 cui/source/customize/selector.cxx  |4 
 cui/source/dialogs/hyphen.cxx  |   10 --
 cui/source/dialogs/scriptdlg.cxx   |6 -
 cui/source/inc/optlingu.hxx|3 
 cui/source/options/optgdlg.cxx |8 -
 cui/source/options/optlingu.cxx|2 
 cui/source/options/treeopt.cxx |   10 --
 offapi/UnoApi_offapi.mk|5 -
 offapi/com/sun/star/chart2/RegressionEquation.idl  |   35 +++
 offapi/com/sun/star/script/browse/BrowseNodeFactory.idl|1 
 offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl |7 -
 sw/inc/swtypes.hxx |3 
 sw/source/core/bastyp/swtypes.cxx  |2 
 sw/source/core/doc/docedt.cxx  |1 
 sw/source/core/edit/edlingu.cxx|1 
 sw/source/core/txtnode/txtedt.cxx  |2 
 sw/source/ui/lingu/hyp.cxx |6 -
 sw/source/ui/uiview/view0.cxx  |5 -
 sw/source/ui/uiview/viewling.cxx   |   14 +-
 xmloff/source/chart/SchXMLPlotAreaContext.cxx  |   64 +
 xmloff/source/draw/animationimport.cxx |   11 +-
 xmloff/source/draw/shapeexport.cxx |7 -
 xmloff/source/transform/OOo2Oasis.cxx  |   24 ++--
 26 files changed, 131 insertions(+), 161 deletions(-)

New commits:
commit 3e563377333881efa60aaa93d2feeaf647cf19ff
Author: Noel Grandin 
Date:   Tue May 14 15:54:42 2013 +0200

fdo#46808, More LinguProperties fun

Change-Id: Ia3173e980370f532fcabc8f1c7a913e5d66d6d8a

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index e7bfc03..7e4e724 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -360,19 +360,15 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, 
Button *, EMPTYARG /*pButt
 {
 try
 {
-uno::Reference< beans::XPropertySet >  xProp( 
SvxGetLinguPropertySet() );
-const OUString aName( "IsHyphAuto" );
-uno::Any aAny;
+uno::Reference< linguistic2::XLinguProperties >  xProp( 
SvxGetLinguPropertySet() );
 
-aAny <<= sal_True;
-xProp->setPropertyValue( aName, aAny );
+xProp->setIsHyphAuto( sal_True );
 
 bBusy = sal_True;
 ContinueHyph_Impl( /*nHyphPos*/nOldPos );
 bBusy = sal_False;
 
-aAny <<= sal_False;
-xProp->setPropertyValue( aName, aAny );
+xProp->setIsHyphAuto( sal_False );
 }
 catch (uno::Exception &e)
 {
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index abafc39..ee6c51c 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -38,6 +38,7 @@ namespace beans{
 namespace linguistic2{
 class XDictionary;
 class XDictionaryList;
+class XLinguProperties;
 
 
 class SvTreeListEntry;
@@ -123,7 +124,7 @@ private:
 String  sHyphSpecial;
 
 com::sun::star::uno::Reference<
-com::sun::star::beans::XPropertySet >   xProp;
+com::sun::star::linguistic2::XLinguProperties > xProp;
 
 com::sun::star::uno::Reference<
 com::sun::star::linguistic2::XDictionaryList >  xDicList;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 86e6f48..7a3a9e3 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1349,7 +1349,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& 
rSet )
 pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( 
aDatePatternsED.GetText());
 
 SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
-Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), 
UNO_QUERY );
+Reference< css::linguistic2::XLinguProperties > xLinguProp = 
LinguMgr::GetLinguPropertySet();
 sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
 if(aCurrentDocCB.IsEnabled())
 bLanguageCurrentDoc_Impl = bCurrentDocCBChecked;
@@ -1367,7 +1367,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& 
rSet )
 OUString aPropName( "DefaultLocale" );
 pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
 if (xLinguProp.is())
-xLinguProp->setPropertyValue( aPropName, aValue );
+xLinguProp->setDefaultLocale( aLocale );
 }
 if(pCurrentDocShell)
  

[Libreoffice-commits] core.git: 10 commits - config_host.mk.in configure.ac svx/source

[Tor Lillqvist]

 config_host.mk.in  |9 -
 configure.ac   |   23 ---
 svx/source/gallery2/galobj.cxx |2 --
 3 files changed, 34 deletions(-)

New commits:
commit c909d7a7ee3b193af69546a6f0e98860cd4877bf
Author: Tor Lillqvist 
Date:   Wed May 15 09:09:13 2013 +0300

Fix warning: unused variable 'aWhite' [loplugin]

Change-Id: Ic25f9e6b2cfc902745cbef97b3164f33c6e03f9a

diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 29791da..462d8cc 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -66,8 +66,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
 
 if( aBmpSize.Width() && aBmpSize.Height() )
 {
-const Color aWhite( COL_WHITE );
-
 if( aBmpEx.GetPrefMapMode().GetMapUnit() != MAP_PIXEL &&
 aBmpEx.GetPrefSize().Width() > 0 &&
 aBmpEx.GetPrefSize().Height() > 0 )
commit 49ff95f0c1d0ee20bfccba648cfd7c1db47158a3
Author: Tor Lillqvist 
Date:   Wed May 15 08:41:30 2013 +0300

LIBMGR_X64_BINARY is unused

Change-Id: Ic3ea17a66d8cc045088ce2a625a79569c8fec431

diff --git a/config_host.mk.in b/config_host.mk.in
index 1011dd3..ada0151b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,7 +291,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
 export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
diff --git a/configure.ac b/configure.ac
index 5f89212..31e07e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3164,7 +3164,6 @@ if test "$_os" = "WINNT"; then
 BUILD_X64=
 CXX_X64_BINARY=
 LINK_X64_BINARY=
-LIBMGR_X64_BINARY=
 
 if test "$BITNESS_OVERRIDE" = ""; then
 AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit 
Explorer extensions])
@@ -3175,12 +3174,10 @@ if test "$_os" = "WINNT"; then
 BUILD_X64=TRUE
 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/cl.exe"
 LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/link.exe"
-LIBMGR_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/lib.exe"
 elif "$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" -? /dev/null 2>&1; then
 BUILD_X64=TRUE
 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"
 LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe"
-LIBMGR_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/lib.exe"
 fi
 fi
 if test "$BUILD_X64" = TRUE; then
@@ -3195,8 +3192,6 @@ if test "$_os" = "WINNT"; then
 # These are passed to the environment and then used in 
gbuild/platform/com_MSC_class.mk
 AC_SUBST(CXX_X64_BINARY)
 AC_SUBST(LINK_X64_BINARY)
-AC_SUBST(LIBMGR_X64_BINARY)
-
 else
 AC_MSG_CHECKING([the compiler is MinGW])
 MACHINE_PREFIX=`$CC -dumpmachine`
commit 8906309a363c53b72f90ef904a49e8eaf12bdb3b
Author: Tor Lillqvist 
Date:   Wed May 15 08:33:55 2013 +0300

JAVACISKAFFE is unused

Change-Id: Id3bc14b65e761dc230491dd8cf4c3785a0eaa37e

diff --git a/config_host.mk.in b/config_host.mk.in
index 4c9beb9..1011dd3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -250,7 +250,6 @@ export INSTDIR=@INSTDIR@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export JAVACISGCJ=@JAVACISGCJ@
-export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
diff --git a/configure.ac b/configure.ac
index 2abcefa..5f89212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6289,17 +6289,6 @@ if test "$SOLAR_JAVA" != ""; then
 fi
 AC_SUBST(JAVACISGCJ)
 
-JAVACISKAFFE=""
-dnl ===
-dnl Checks that javac is kaffe
-dnl ===
-if test "$SOLAR_JAVA" != ""; then
-if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then
-JAVACISKAFFE="yes"
-fi
-fi
-AC_SUBST(JAVACISKAFFE)
-
 dnl ===
 dnl Checks for javadoc
 dnl ===
commit 9922ec862ece36eef9c2a8576ba785326b93a021
Author: Tor Lillqvist 
Date:   Wed May 15 08:29:19 2013 +0300

DYNAMIC_CRT is unused

Change-Id: Iabeec6542d18f773a0ae5781214ec7d4ce02b3ab

diff --git a/config_host.mk.in b/config_host.mk.in
index ed82869..4c9beb9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -103,7 +103,6 @@ export DOCDIR=@DOCDIR@
 export DOXYGEN=@DOXYGEN@
 export DO_FETCH_TARBALLS=@DO_FET

[PUSHED libreoffice-4-0] Fix fdo#64579 Don't assume dsp:dataModelExt has valid Drawin...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3910

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3910
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens 
Gerrit-Reviewer: Fridrich Strba 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#64011 fix the position and the drawing from left to righ...

[Faisal al-otaibi (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3912

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/3912/1

fdo#64011 fix the position and the drawing from left to right in RTL sheet

this will fix the start position for drawing and you can draw shapes
from left to right when the Sheet are RTL

Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
---
M sc/source/ui/drawfunc/fuconstr.cxx
1 file changed, 7 insertions(+), 0 deletions(-)



diff --git a/sc/source/ui/drawfunc/fuconstr.cxx 
b/sc/source/ui/drawfunc/fuconstr.cxx
index 5d8f270..381aeb4 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -83,6 +83,7 @@
 // involved. Lets calculate where aPos would be at 100% zoom
 // that's the actual correct position for the object ( when you
 // restore the zoom.
+sal_Bool bNegative = pDoc->IsNegativePage(pView->GetTab());
 Rectangle aObjRect( rInOutPos, rInOutPos );
 ScRange aRange = pDoc->GetRange( pView->GetTab(), aObjRect );
 ScAddress aOldStt = aRange.aStart;
@@ -98,6 +99,12 @@
 Point aOff = ( rInOutPos - aCurPosHmm );
 rInOutPos = aOldPos + aOff;
 aRetGridOff = aCurPosHmm - aOldPos;
+// fdo#64011 fix the X position when the sheet are RTL
+if ( bNegative )
+{
+aRetGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
+rInOutPos.setX( aOff.getX() - aOldPos.getX() );
+}
 }
 return aRetGridOff;
 }

-- 
To view, visit https://gerrit.libreoffice.org/3912
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source

[Thorsten Behrens]

 oox/source/ppt/extdrawingfragmenthandler.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2904e4d618a57771662ef435df0f478423714e41
Author: Thorsten Behrens 
Date:   Wed May 15 01:28:50 2013 +0200

Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.

Just don't assume the DSP_TOKEN( spTree ) was seen in input.

Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
(cherry picked from commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680)
Reviewed-on: https://gerrit.libreoffice.org/3910
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx 
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index f065415..dc62bd6 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -86,8 +86,11 @@ ExtDrawingFragmentHandler::createFastChildContext( 
::sal_Int32 aElement,
 }
 void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
 {
-mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
-mpShapePtr->setName( mpOrgShapePtr->getName() );
+if( mpShapePtr )
+{
+mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
+mpShapePtr->setName( mpOrgShapePtr->getName() );
+}
 }
 
 } }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 include/svtools/fmtfield.hxx|1 +
 svtools/source/control/fmtfield.cxx |   26 +++---
 2 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 9c3420d18173fd6c9380cf8ff7e2a4ad886e9e0b
Author: Lionel Elie Mamane 
Date:   Wed May 15 07:24:43 2013 +0200

svtools FormattedField: don't reparse value from text after ReFormat

If our format is lossy / not a bijection
(as is e.g. our default date format, because of 2-digit year),
then reparsing the string that came from the format
leads to data loss (the value is changed to something else).

The existing code tried to do that, by calling Modify()
and then setting m_bValueDirty to false.
However, this fails because listeners are called
while m_bValueDirty is true. If any of them calls
e.g. GetValue(), the reparse happens.

Change-Id: I272f377927f83c71ede1eb80eafbc689f36fb17a

diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 8486926..6fab7e4 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -236,6 +236,7 @@ public:
 
 protected:
 virtual long Notify(NotifyEvent& rNEvt);
+void impl_Modify(bool makeValueDirty = true);
 virtual void Modify();
 
 // CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit
diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index 53ccc33..7e04e8c 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -487,13 +487,14 @@ void FormattedField::SetAutoColor(sal_Bool _bAutomatic)
 }
 
 
//--
-void FormattedField::Modify()
+void FormattedField::impl_Modify(bool makeValueDirty)
 {
 DBG_CHKTHIS(FormattedField, NULL);
 
 if (!IsStrictFormat())
 {
-m_bValueDirty = sal_True;
+if(makeValueDirty)
+m_bValueDirty = sal_True;
 SpinField::Modify();
 return;
 }
@@ -503,7 +504,8 @@ void FormattedField::Modify()
 {
 m_sLastValidText = sCheck;
 m_aLastSelection = GetSelection();
-m_bValueDirty = sal_True;
+if(makeValueDirty)
+m_bValueDirty = sal_True;
 }
 else
 {
@@ -514,6 +516,14 @@ void FormattedField::Modify()
 }
 
 
//--
+void FormattedField::Modify()
+{
+DBG_CHKTHIS(FormattedField, NULL);
+
+impl_Modify();
+}
+
+//--
 void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
 {
 DBG_CHKTHIS(FormattedField, NULL);
@@ -789,10 +799,12 @@ void FormattedField::Commit()
 
 // did the text change?
 if ( GetText() != sOld )
-{   // consider the field as modified
-Modify();
-// but we have the most recent value now
-m_bValueDirty = sal_False;
+{   // consider the field as modified,
+// but we already have the most recent value;
+// don't reparse it from the text
+// (can lead to data loss when the format is lossy,
+//  as is e.g. our default date format: 2-digit year!)
+impl_Modify(false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Tor Lillqvist]

 config_host.mk.in |1 -
 configure.ac  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 35fdbea1a112c0f0bf8ea6e9003cf0e13b9cd886
Author: Tor Lillqvist 
Date:   Tue May 14 21:20:29 2013 +0300

FRAMEWORKSHOME is not used outside configure.ac

Change-Id: Ic8eae6d7e9590ad75c414568877aa093c92ce536

diff --git a/config_host.mk.in b/config_host.mk.in
index 02da41e..dd27847 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -173,7 +173,6 @@ export FLEX=@FLEX@
 export FLUTE_JAR=@FLUTE_JAR@
 export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
 export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@
-export FRAMEWORKSHOME=@FRAMEWORKSHOME@
 export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
 export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@
 export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
diff --git a/configure.ac b/configure.ac
index f35d2da..60b0e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2620,7 +2620,6 @@ if test "$_os" = "Darwin"; then
 
 AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER])
 fi
-AC_SUBST(FRAMEWORKSHOME)
 AC_SUBST(MACOSX_SDK_PATH)
 AC_SUBST(MACOSX_SDK_VERSION)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/Library_sc.mk sc/source

[Kohei Yoshida]

 sc/Library_sc.mk|1 
 sc/inc/clipcontext.hxx  |   26 ++
 sc/inc/column.hxx   |7 --
 sc/inc/document.hxx |   16 +++---
 sc/inc/table.hxx|7 --
 sc/source/core/data/clipcontext.cxx |   19 
 sc/source/core/data/column3.cxx |6 ++---
 sc/source/core/data/document.cxx|   41 ++--
 sc/source/core/data/table2.cxx  |8 +++
 9 files changed, 93 insertions(+), 38 deletions(-)

New commits:
commit c7fec34b4c60564212036ef5cd77636686689646
Author: Kohei Yoshida 
Date:   Tue May 14 23:39:50 2013 -0400

Introduce copy-from-clip context for copy handling code.

It's not used yet, and is currently empty.

Change-Id: Ia377994ae042fc8b19d269adc2f94830422770f1

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 6f322ee..f4ed57d 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/cell \
sc/source/core/data/cell2 \
sc/source/core/data/cellvalue \
+   sc/source/core/data/clipcontext \
sc/source/core/data/clipparam \
sc/source/core/data/column \
sc/source/core/data/column2 \
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
new file mode 100644
index 000..00049f1
--- /dev/null
+++ b/sc/inc/clipcontext.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_CLIPCONTEXT_HXX
+#define SC_CLIPCONTEXT_HXX
+
+namespace sc {
+
+class CopyFromClipContext
+{
+public:
+CopyFromClipContext();
+~CopyFromClipContext();
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b7539c6..9d810e1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -50,6 +50,7 @@ namespace editeng { class SvxBorderLine; }
 namespace sc {
 struct FormulaGroupContext;
 class EndListeningContext;
+class CopyFromClipContext;
 }
 
 class Fraction;
@@ -234,8 +235,10 @@ public:
 void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, bool 
bKeepScenarioFlags) const;
 void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol);
 void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn& rDestCol 
);
-voidCopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
-sal_uInt16 nInsFlag, bool bAsLink, bool 
bSkipAttrForEmpty, ScColumn& rColumn);
+void CopyFromClip(
+sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy,
+sal_uInt16 nInsFlag, bool bAsLink, bool bSkipAttrForEmpty, ScColumn& 
rColumn );
+
 voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
 voidBroadcastInArea( SCROW nRow1, SCROW nRow2 );
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0c59a67..7b7ea40 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -50,6 +50,7 @@ namespace editeng { class SvxBorderLine; }
 namespace sc {
 struct FormulaGroupContext;
 class EndListeningContext;
+class CopyFromClipContext;
 }
 class SvxFontItem;
 
@@ -1140,13 +1141,14 @@ public:
 
 voidCopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2,
 SCTAB nTab, ScDocument* pClipDoc = NULL);
-voidCopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
-const ScMarkData& rMark, SCsCOL nDx, 
SCsROW nDy,
-const ScCopyBlockFromClipParams* pCBFCP );
-voidCopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
-const ScMarkData& rMark, SCsCOL nDx, 
SCsROW nDy,
-const ScCopyBlockFromClipParams* pCBFCP,
-SCROW & rClipStartRow );
+void CopyBlockFromClip(
+sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
+const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const 
ScCopyBlockFromClipParams* pCBFCP );
+void CopyNonFilteredFromClip(
+sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
+const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const 
ScCopyBlockFromClipParams* pCBFCP,
+SCROW & rClipStartRow );
+
 voidStartListeningFromClip( SCCOL nCol1, SCROW nRow1,
 SCCOL nCol2, SCROW nRow2,
 c

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/document.cxx |  303 +++
 1 file changed, 152 insertions(+), 151 deletions(-)

New commits:
commit 79b86d051f5c4e7d2c744201bde146ba5e5bf7e5
Author: Kohei Yoshida 
Date:   Tue May 14 21:33:22 2013 -0400

Reduce indentation level by early bail-out.

Change-Id: I5e108efa0219620696d15a304d2f4e3566d58d57

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3cfdaa6..c51804a 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2434,173 +2434,174 @@ void ScDocument::CopyFromClip( const ScRange& 
rDestRange, const ScMarkData& rMar
 bool bAsLink, bool bIncludeFiltered, bool 
bSkipAttrForEmpty,
 const ScRangeList * pDestRanges )
 {
-if (!bIsClip)
+if (bIsClip)
+return;
+
+if (!pClipDoc)
 {
-if (!pClipDoc)
+OSL_FAIL("CopyFromClip: no ClipDoc");
+pClipDoc = SC_MOD()->GetClipDoc();
+}
+
+if (!pClipDoc->bIsClip || !pClipDoc->GetTableCount())
+return;
+
+bool bOldAutoCalc = GetAutoCalc();
+SetAutoCalc( false );   // avoid multiple recalculations
+
+NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
+
+SCCOL nAllCol1 = rDestRange.aStart.Col();
+SCROW nAllRow1 = rDestRange.aStart.Row();
+SCCOL nAllCol2 = rDestRange.aEnd.Col();
+SCROW nAllRow2 = rDestRange.aEnd.Row();
+
+SCCOL nXw = 0;
+SCROW nYw = 0;
+ScRange aClipRange = pClipDoc->GetClipParam().getWholeRange();
+for (SCTAB nTab = 0; nTab < static_cast(pClipDoc->maTabs.size()); 
nTab++)// find largest merge overlap
+if (pClipDoc->maTabs[nTab])   // all sheets of the 
clipboard content
 {
-OSL_FAIL("CopyFromClip: no ClipDoc");
-pClipDoc = SC_MOD()->GetClipDoc();
+SCCOL nThisEndX = aClipRange.aEnd.Col();
+SCROW nThisEndY = aClipRange.aEnd.Row();
+pClipDoc->ExtendMerge( aClipRange.aStart.Col(),
+aClipRange.aStart.Row(),
+nThisEndX, nThisEndY, nTab );
+// only extra value from ExtendMerge
+nThisEndX = sal::static_int_cast( nThisEndX - 
aClipRange.aEnd.Col() );
+nThisEndY = sal::static_int_cast( nThisEndY - 
aClipRange.aEnd.Row() );
+if ( nThisEndX > nXw )
+nXw = nThisEndX;
+if ( nThisEndY > nYw )
+nYw = nThisEndY;
 }
-if (pClipDoc->bIsClip && pClipDoc->GetTableCount())
-{
-bool bOldAutoCalc = GetAutoCalc();
-SetAutoCalc( false );   // avoid multiple recalculations
 
-NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
+SCCOL nDestAddX;
+SCROW nDestAddY;
+pClipDoc->GetClipArea( nDestAddX, nDestAddY, bIncludeFiltered );
+nXw = sal::static_int_cast( nXw + nDestAddX );
+nYw = sal::static_int_cast( nYw + nDestAddY );   // ClipArea, plus 
ExtendMerge value
+
+/*  Decide which contents to delete before copying. Delete all
+contents if nInsFlag contains any real content flag.
+#i102056# Notes are pasted from clipboard in a second pass,
+together with the special flag IDF_ADDNOTES that states to not
+overwrite/delete existing cells but to insert the notes into
+these cells. In this case, just delete old notes from the
+destination area. */
+sal_uInt16 nDelFlag = IDF_NONE;
+if ( (nInsFlag & (IDF_CONTENTS | IDF_ADDNOTES)) == (IDF_NOTE | 
IDF_ADDNOTES) )
+nDelFlag |= IDF_NOTE;
+else if ( nInsFlag & IDF_CONTENTS )
+nDelFlag |= IDF_CONTENTS;
+//  With bSkipAttrForEmpty, don't remove attributes, copy
+//  on top of existing attributes instead.
+if ( ( nInsFlag & IDF_ATTRIB ) && !bSkipAttrForEmpty )
+nDelFlag |= IDF_ATTRIB;
 
-SCCOL nAllCol1 = rDestRange.aStart.Col();
-SCROW nAllRow1 = rDestRange.aStart.Row();
-SCCOL nAllCol2 = rDestRange.aEnd.Col();
-SCROW nAllRow2 = rDestRange.aEnd.Row();
+ScCopyBlockFromClipParams aCBFCP;
+aCBFCP.pRefUndoDoc = pRefUndoDoc;
+aCBFCP.pClipDoc = pClipDoc;
+aCBFCP.nInsFlag = nInsFlag;
+aCBFCP.bAsLink  = bAsLink;
+aCBFCP.bSkipAttrForEmpty = bSkipAttrForEmpty;
+aCBFCP.nTabStart = MAXTAB;  // wird in der Schleife angepasst
+aCBFCP.nTabEnd = 0; // wird in der Schleife angepasst
 
-SCCOL nXw = 0;
-SCROW nYw = 0;
-ScRange aClipRange = pClipDoc->GetClipParam().getWholeRange();
-for (SCTAB nTab = 0; nTab < 
static_cast(pClipDoc->maTabs.size()); nTab++)// find largest merge 
overlap
-if (pClipDoc->maTabs[nTab])   // all sheets of 
the clipboard content
-{
-SCCOL nThisEndX = aClipRange.aEnd.Col();
-SCR

[PATCH] String to OUString in calc header & footer edit

[Olivier Hallot (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3911

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/3911/1

String to OUString in calc header & footer edit

Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
---
M sc/inc/scabstdlg.hxx
M sc/source/ui/attrdlg/scdlgfact.cxx
M sc/source/ui/attrdlg/scdlgfact.hxx
M sc/source/ui/inc/hfedtdlg.hxx
M sc/source/ui/pagedlg/hfedtdlg.cxx
5 files changed, 8 insertions(+), 11 deletions(-)



diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5190c9a..f96344a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -491,7 +491,7 @@
 virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* 
pFrame, //add for ScHFEditDlg
 Window* pParent,
 const SfxItemSet&   
rCoreSet,
-const String&   
rPageStyle,
+const OUString&   
rPageStyle,
 int nId,
 sal_uInt16  
nResId = RID_SCDLG_HFEDIT ) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index e9945b8..6be8ac4 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1237,7 +1237,7 @@
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( 
SfxViewFrame*   pFrame,
 
Window* pParent,
 const 
SfxItemSet&   rCoreSet,
-const 
String&   rPageStyle,
+const 
OUString& rPageStyle,
 int 
nId,
 
sal_uInt16  nResId )
 {
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index a18767c..b622f42 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -558,7 +558,7 @@
 virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* 
pFrame, //add for ScHFEditDlg
 Window* pParent,
 const SfxItemSet&   
rCoreSet,
-const String&   
rPageStyle,
+const OUString& 
rPageStyle,
 int nId,
 sal_uInt16  
nResId = RID_SCDLG_HFEDIT );
 
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 56a50a9..0ec88c3 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -36,7 +36,7 @@
 ScHFEditDlg( SfxViewFrame*  pFrame,
  Window*pParent,
  const SfxItemSet&  rCoreSet,
- const String&  rPageStyle,
+ const OUString&rPageStyle,
  sal_uInt16 nResId = RID_SCDLG_HFEDIT );
 
 ~ScHFEditDlg();
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx 
b/sc/source/ui/pagedlg/hfedtdlg.cxx
index a74e267..4f095d3 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -53,19 +53,16 @@
 ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
   Window*   pParent,
   const SfxItemSet& rCoreSet,
-  const String& rPageStyle,
+  const OUString&   rPageStyle,
   sal_uInt16nResIdP )
 :   SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet )
 {
 eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType();
 
-String aTmp = GetText();
+OUString aTmp = GetText();
 
-aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" ));
-aTmp += ScGlobal::GetRscString( STR_PAGESTYLE );
-aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
-aTmp += rPageStyle;
-aTmp += ')';
+aTmp += " (" + ScGlobal::GetRscString( STR_PAGESTYLE ) + ": " + rPageStyle 
+ ")";
+
 SetText( aTmp );
 
 switch ( nResIdP )

-- 
To view, visit https://gerrit.libreoffice.org/3911
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch:

[PATCH libreoffice-4-0] Fix fdo#64579 Don't assume dsp:dataModelExt has valid Drawin...

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3910

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/3910/1

Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.

Just don't assume the DSP_TOKEN( spTree ) was seen in input.

Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
(cherry picked from commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680)
---
M oox/source/ppt/extdrawingfragmenthandler.cxx
1 file changed, 5 insertions(+), 2 deletions(-)



diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx 
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index f065415..dc62bd6 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -86,8 +86,11 @@
 }
 void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
 {
-mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
-mpShapePtr->setName( mpOrgShapePtr->getName() );
+if( mpShapePtr )
+{
+mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
+mpShapePtr->setName( mpOrgShapePtr->getName() );
+}
 }
 
 } }

-- 
To view, visit https://gerrit.libreoffice.org/3910
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 3 commits - canvas/source oox/source vcl/inc vcl/source

[Thorsten Behrens]

 canvas/source/cairo/cairo_canvasbitmap.cxx   |2 +-
 oox/source/ppt/extdrawingfragmenthandler.cxx |7 +--
 vcl/inc/vcl/gdimtf.hxx   |2 +-
 vcl/source/gdi/gdimtf.cxx|   15 ++-
 vcl/source/gdi/pdfwriter_impl2.cxx   |2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit e00faa6f01ea4437c25c64cb5b7fa7fbfdfdb9f2
Author: Thorsten Behrens 
Date:   Wed May 15 01:28:50 2013 +0200

Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.

Just don't assume the DSP_TOKEN( spTree ) was seen in input.

Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
(cherry picked from commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680)

diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx 
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index f065415..dc62bd6 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -86,8 +86,11 @@ ExtDrawingFragmentHandler::createFastChildContext( 
::sal_Int32 aElement,
 }
 void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
 {
-mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
-mpShapePtr->setName( mpOrgShapePtr->getName() );
+if( mpShapePtr )
+{
+mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
+mpShapePtr->setName( mpOrgShapePtr->getName() );
+}
 }
 
 } }
commit 44d92cfa4143475dba8414a94150bc669aeb9909
Author: Thorsten Behrens 
Date:   Sat May 11 23:09:37 2013 +0200

Fix indent.

Change-Id: Ia02968ccc12df994bc8528794e8f55a5eeda25be

diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx 
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index c0759c0..6839548 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -134,7 +134,7 @@ namespace cairocanvas
 return maCanvasHelper.repaint( pSurface, viewState, renderState );
 }
 
-void SAL_CALL CanvasBitmap::setFastPropertyValue( sal_Int32 nHandle, 
const ::com::sun::star::uno::Any& rAny )  throw (uno::RuntimeException)
+void SAL_CALL CanvasBitmap::setFastPropertyValue( sal_Int32 nHandle, const 
::com::sun::star::uno::Any& rAny )  throw (uno::RuntimeException)
 {
 sal_Int64 nPointer;
 
commit 4c676625d4016d428e9becd5512b7cfc8b0c4b24
Author: Radek Doulik 
Date:   Mon Apr 29 00:00:00 2013 +0200

Fix bnc#795857 Use correct sizes for EMF+ bitmap rendering

Fix pdf export wrong size issues for embedded EMF+ images.

Change-Id: I998c9535bde32fc9f452d61d7cb7609c95f5528d

diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index ecefb90..90fce69 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -124,7 +124,7 @@ private:
   const OutputDevice&   
rMapDev,
   const PolyPolygon&
rPolyPoly,
   const Gradient&   
rGrad   );
-SAL_DLLPRIVATE bool  ImplPlayWithRenderer( OutputDevice* pOut, 
const Point& rPos, Size rDestSize );
+SAL_DLLPRIVATE bool  ImplPlayWithRenderer( OutputDevice* pOut, 
const Point& rPos, Size rLogicDestSize );
 SAL_DLLPRIVATE void  ImplDelegate2PluggableRenderer( const 
MetaCommentAction* pAct, OutputDevice* pOut );
 
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 3fbb01c..526196d 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -399,7 +399,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
 
 OSL_TRACE("GDIMetaFile::Play on device of size: %d x %d", 
pOut->GetOutputSizePixel().Width(), pOut->GetOutputSizePixel().Height());
 
-if( !ImplPlayWithRenderer( pOut, Point(0,0), 
pOut->GetOutputSizePixel() ) ) {
+if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSize() ) ) 
{
 size_t  i  = 0;
 for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; 
nCurPos++ )
 {
@@ -430,11 +430,13 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
 
 // 
 
-bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, 
Size rDestSize )
+bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, 
Size rLogicDestSize )
 {
 if (!bUseCanvas)
 return false;
 
+Size rDestSize( pOut->LogicToPixel( rLogicDestSize ) );
+
 const Window* win = dynamic_cast  ( pOut );
 
 if (!win)
@@ -485,7 +487,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, 
const Point& rPos, S
 uno::Any aAny = 
xFastPropertySet->getFastPropertyValue( 0 );
 BitmapEx* pBitmapEx = (Bitm

[Libreoffice-commits] core.git: oox/source

[Thorsten Behrens]

 oox/source/ppt/extdrawingfragmenthandler.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680
Author: Thorsten Behrens 
Date:   Wed May 15 01:28:50 2013 +0200

Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.

Just don't assume the DSP_TOKEN( spTree ) was seen in input.

Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c

diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx 
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index bc1adf3..7fecb89 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -65,8 +65,11 @@ ExtDrawingFragmentHandler::createFastChildContext( 
::sal_Int32 aElement,
 }
 void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
 {
-mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
-mpShapePtr->setName( mpOrgShapePtr->getName() );
+if( mpShapePtr )
+{
+mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() );
+mpShapePtr->setName( mpOrgShapePtr->getName() );
+}
 }
 
 } }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |   27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit e3d6d17741e3751fcfd77803699917f6ab30e644
Author: Kohei Yoshida 
Date:   Tue May 14 17:30:11 2013 -0400

Add perf test for removal of large array of formula cells.

Change-Id: I2fdf38b23e74a9f4cad7abd9a943e8817f39474c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d051908..07fa33f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -112,7 +112,8 @@ public:
 /**
  * Basic performance regression test. Pick some actions that *should* take
  * only a fraction of a second to complete, and make sure they stay that
- * way.
+ * way. We set the threshold to 1 second for each action which should be
+ * large enough to accommodate slower machines or machines with high load.
  */
 void testPerf();
 void testCollator();
@@ -486,6 +487,30 @@ void Test::testPerf()
 CPPUNIT_FAIL(os.str().c_str());
 }
 
+{
+// Switch to R1C1 to make it easier to input relative references in 
multiple cells.
+FormulaGrammarSwitch aFGSwitch(m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
+
+// Insert formulas in B1:B10. This shouldn't take long, but may 
take
+// close to a second on a slower machine. We don't measure this yet, 
for
+// now.
+for (SCROW i = 0; i < 10; ++i)
+m_pDoc->SetString(ScAddress(1,i,0), "=RC[-1]");
+
+// Now, Delete B2:B10. This should complete in a fraction of a 
second
+// (0.06 sec on my machine).
+osl_getSystemTime(&aTimeBefore);
+clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
+osl_getSystemTime(&aTimeAfter);
+diff = getTimeDiff(aTimeAfter, aTimeBefore);
+if (diff >= 1.0)
+{
+std::ostringstream os;
+os << "Removal of a large array of formula cells took " << diff << 
" seconds. It should be instant.";
+CPPUNIT_FAIL(os.str().c_str());
+}
+}
+
 m_pDoc->DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Where to find the sources for the tinderbox status?

[Philipp Riemer]

Hi Christian,
LOL and thank you a lot for your long reply and the obvious hint ;-) I must
have been pretty tired to not realize this section in the script.

While rusty with Perl (I once wrote some Nagios check scripts in it several
years ago and before there were Icinga and Shinken), I got some test script
working and added my few cases. Unfortunately, I am unable to push these
back upstream (might be PEBKAC), so that I attached the patch to this mail.
Could you please take care of integrating the changes?

Have a nice week!
Philipp

PS: Next week - Linuxtag in Berlin ! Will
you be there?


2013/5/12 Christian Lohmaier 

> Hi Philipp, *,
>
> On Sun, May 12, 2013 at 9:40 PM, Philipp Riemer 
> wrote:
> >
> > Thanks for the link. Uh, Perl...
>
> regular expressions would be mor or less the same in other langauges,
> so no difference here. And using something else than perl "just for
> the sake of it" would be pointless.
>
> > Nevertheless, the important line seems to
> > be:
> >
> > ($line =~ /\b(? > [...]
> > What I want, is to ignore it if there is ... at the end of the string:
>
> You didn't bother to look at the whole file, so I won't bother to
> write a long reply right now.
>
> > So far I have the following (see ):
> >
> > (?!\.) matches
> > (1) a single arbitrary character or
>
> no.
>
> > (2) an exclamation mark or
>
> no.
>
> the ? signals a group-matching modifier. i.e. it changes the meaning
> of the () block. ?! makes the stuff in () to be a "A zero-width
> negative look-ahead assertion."
>
> > (3) a dot
>
> yes (and no) - it matches a dot inside the (), but the whole rule says
> it should only match the previous part *not* followed by a dot.
>
> Similarily, the (?
> So the pattern matches Error or error, but only if that [Ee]rror is
> not after a / and not before a .
>
> > and the \b stands for "boundary" (alphanum on the left and !alphanum on
> the
> > right or the other way around), so obviously both, the tick and the
> slash,
> > are !alphanum (as is the colon, which should still match)...
>
> Nah, you'r tricking yourself again. \b ist a change of \w to \W (not
> just alphanum, but also _ and some additional unicode characters) or
> the other way round, as you wrote yourself.
> But a line like  foo/Error.something would happily match \bError\b -
> as the / marks a switch - but it should *not* match.
>
> > So maybe the easiest would be to add a "and !(A or B)" to the line to
> > invalidate a false positive match?
>
> No, see my comment abve about you not looking at the whole file.
>
> There are a bunch of whitelist lines in there, lines that matche the
> overall error-marking regexes, that should be *ignore*d (hint, hint
> :-))) and not counted as errors.
>
> ciao
> Christian
>


0001-Added-rules-to-capture-more-false-positives-in-log-o.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/textuno.hxx  |4 +++-
 sc/source/ui/unoobj/textuno.cxx |1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4038dd021673730a28b0e560c6ba613da1ff
Author: Kohei Yoshida 
Date:   Tue May 14 16:25:41 2013 -0400

Fix memory leak.

Change-Id: I90e419d19f4565f7f20603358308fd7aeba83190

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 19f9eff..e531c8e 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -35,6 +35,8 @@
 #include "rtl/ref.hxx"
 #include "scdllapi.h"
 
+#include 
+
 class EditEngine;
 class EditTextObject;
 class SvxEditEngineForwarder;
@@ -110,7 +112,7 @@ public:
 
 //  ScHeaderFooterTextData: shared data between sub objects of a 
ScHeaderFooterTextObj
 
-class ScHeaderFooterTextData
+class ScHeaderFooterTextData : boost::noncopyable
 {
 private:
 EditTextObject* mpTextObj;
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 77ba10f..3976e21 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -200,6 +200,7 @@ ScHeaderFooterTextData::~ScHeaderFooterTextData()
 
 delete pForwarder;
 delete pEditEngine;
+delete mpTextObj;
 }
 
 SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

[Pavel Janík]

 svx/source/sidebar/insert/InsertPropertyPanel.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9d54c0355f37ced80fed1b24f238d4c8751a2345
Author: Pavel Janík 
Date:   Tue May 14 18:59:35 2013 +

Remove unused variable to prevent compiler warning.

diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx 
b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index c2e7235..72b4185 100755
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -112,7 +112,6 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, 
VclSimpleEvent*, pEvent)
 return 1;
 
 Window* pWindow = dynamic_cast(pEvent)->GetWindow();
-Window* pParent = pWindow->GetParent();
 ToolBox* pToolBox = dynamic_cast(pWindow);
 if (pToolBox == NULL)
 return 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source

[Caolán McNamara]

 svx/source/sidebar/insert/InsertPropertyPanel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5c671722b28ec790e61522a48a99c08055ad033
Author: Caolán McNamara 
Date:   Tue May 14 20:57:53 2013 +0100

getProcessServiceFactory->getProcessComponentContext

Change-Id: I2c4c44cb5758ef8fa2d83e0488fba65a390c466f

diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx 
b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 2d30e6a..1207ebb 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -276,7 +276,7 @@ void InsertPropertyPanel::CreateController (
 if ( ! aDescriptor.mxController.is())
 aDescriptor.mxController.set(
 static_cast(new svt::GenericToolboxController(
-::comphelper::getProcessServiceFactory(),
+::comphelper::getProcessComponentContext(),
 mxFrame,
 pToolBox,
 nItemId,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 78/4ed0d2e9cc2de7e3de8420d4708ee5c4631a5c

[Caolán McNamara]

 78/4ed0d2e9cc2de7e3de8420d4708ee5c4631a5c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ff7ba9e782715f802598cc7ac5ad32038c479e
Author: Caolán McNamara 
Date:   Tue May 14 20:54:33 2013 +0100

Notes added by 'git notes add'

diff --git a/78/4ed0d2e9cc2de7e3de8420d4708ee5c4631a5c 
b/78/4ed0d2e9cc2de7e3de8420d4708ee5c4631a5c
new file mode 100644
index 000..b5a6351
--- /dev/null
+++ b/78/4ed0d2e9cc2de7e3de8420d4708ee5c4631a5c
@@ -0,0 +1 @@
+merged as: aee443a35f07bd69b32311e0298af220491f9c0b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source

[Andre Fischer]

 svx/source/sidebar/insert/InsertPropertyPanel.cxx |9 +-
 svx/source/sidebar/insert/SimpleToolBoxController.cxx |   79 --
 svx/source/sidebar/insert/SimpleToolBoxController.hxx |   50 ---
 3 files changed, 7 insertions(+), 131 deletions(-)

New commits:
commit aee443a35f07bd69b32311e0298af220491f9c0b
Author: Andre Fischer 
Date:   Fri May 10 11:30:31 2013 +

Related: #i122218# Replaced local tool box controller...

with existing GenericToolboxController (cleanup)

(cherry picked from commit 784ed0d2e9cc2de7e3de8420d4708ee5c4631a5c)

Conflicts:
svx/source/sidebar/insert/SimpleToolBoxController.cxx
svx/source/sidebar/insert/SimpleToolBoxController.hxx

Change-Id: I9c409c2979982ccd5d7a76c10db6c3f7dd59c307

diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx 
b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index fc40f92..2d30e6a 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -17,7 +17,6 @@
  */
 #include "InsertPropertyPanel.hxx"
 #include "InsertPropertyPanel.hrc"
-#include "SimpleToolBoxController.hxx"
 #include "sfx2/sidebar/CommandInfoProvider.hxx"
 
 #include 
@@ -26,6 +25,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -275,7 +275,12 @@ void InsertPropertyPanel::CreateController (
 UNO_QUERY);
 if ( ! aDescriptor.mxController.is())
 aDescriptor.mxController.set(
-static_cast(new SimpleToolBoxController(mxFrame, 
*pToolBox, nItemId, sCommandName)),
+static_cast(new svt::GenericToolboxController(
+::comphelper::getProcessServiceFactory(),
+mxFrame,
+pToolBox,
+nItemId,
+sCommandName)),
 UNO_QUERY);
 if ( ! aDescriptor.mxController.is())
 return;
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.cxx 
b/svx/source/sidebar/insert/SimpleToolBoxController.cxx
deleted file mode 100644
index c60b6ef..000
--- a/svx/source/sidebar/insert/SimpleToolBoxController.cxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "SimpleToolBoxController.hxx"
-
-#include 
-#include 
-#include 
-
-
-using namespace ::com::sun::star;
-
-namespace svx { namespace sidebar {
-
-SimpleToolBoxController::SimpleToolBoxController(
-const cssu::Reference& rxFrame,
-ToolBox& rToolBox,
-const sal_uInt16 nItemId,
-const rtl::OUString& rsCommand)
-: 
svt::ToolboxController(comphelper::getComponentContext(comphelper::getProcessServiceFactory()),
-rxFrame, rsCommand),
-  mrToolbox(rToolBox),
-  mnItemId(nItemId)
-{
-}
-
-
-
-
-SimpleToolBoxController::~SimpleToolBoxController (void)
-{
-}
-
-
-
-
-void SAL_CALL SimpleToolBoxController::statusChanged (const 
css::frame::FeatureStateEvent& rEvent)
-throw (cssu::RuntimeException)
-{
-SolarMutexGuard aSolarMutexGuard;
-
-if (m_bDisposed)
-return;
-
-mrToolbox.EnableItem(mnItemId, rEvent.IsEnabled);
-
-sal_uInt16 nItemBits = mrToolbox.GetItemBits(mnItemId);
-nItemBits &= ~TIB_CHECKABLE;
-TriState eState = STATE_NOCHECK;
-
-sal_Bool bValue = sal_False;
-if (rEvent.State >>= bValue)
-{
-// Boolean, treat it as checked/unchecked
-mrToolbox.CheckItem(mnItemId, bValue);
-if ( bValue )
-eState = STATE_CHECK;
-nItemBits |= TIB_CHECKABLE;
-}
-
-mrToolbox.SetItemState(mnItemId, eState);
-mrToolbox.SetItemBits(mnItemId, nItemBits);
-}
-
-} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/insert/SimpleToolBoxController.hxx 
b/svx/source/sidebar/insert/SimpleToolBoxController.hxx
deleted file mode 100644
index b10bda7..000
--- a/svx/source/sidebar/insert/SimpleToolBoxController.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |  115 +++-
 1 file changed, 38 insertions(+), 77 deletions(-)

New commits:
commit 1a8c826099bf9df196d58d84e67704b31ca4adc1
Author: Kohei Yoshida 
Date:   Tue May 14 15:55:10 2013 -0400

Remove duplicate code blocks.

Change-Id: I945c7ae834393c760d8a552043c391ff0eb9ce22

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index a91722f..b243ea2 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3243,8 +3243,34 @@ void ScFormulaCell::StartListeningTo( ScDocument* pDoc )
 SetNeedsListening( false);
 }
 
-//  pArr gesetzt -> Referenzen von anderer Zelle nehmen
-// Then aPos must also be commited
+namespace {
+
+void endListeningArea(
+ScFormulaCell* pCell, ScDocument& rDoc, const ScAddress& rPos, const 
ScToken& rToken)
+{
+const ScSingleRefData& rRef1 = rToken.GetSingleRef();
+const ScSingleRefData& rRef2 = rToken.GetSingleRef2();
+ScAddress aCell1 = rRef1.toAbs(rPos);
+ScAddress aCell2 = rRef2.toAbs(rPos);
+if (aCell1.IsValid() && aCell2.IsValid())
+{
+if (rToken.GetOpCode() == ocColRowNameAuto)
+{   // automagically
+if ( rRef1.IsColRel() )
+{   // ColName
+aCell2.SetRow(MAXROW);
+}
+else
+{   // RowName
+aCell2.SetCol(MAXCOL);
+}
+}
+
+rDoc.EndListeningArea(ScRange(aCell1, aCell2), pCell);
+}
+}
+
+}
 
 void ScFormulaCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr,
 ScAddress aCellPos )
@@ -3269,60 +3295,17 @@ void ScFormulaCell::EndListeningTo( ScDocument* pDoc, 
ScTokenArray* pArr,
 ScToken* t;
 while ( ( t = static_cast(pArr->GetNextReferenceRPN()) ) != NULL 
)
 {
-StackVar eType = t->GetType();
-ScSingleRefData& rRef1 = t->GetSingleRef();
-ScSingleRefData& rRef2 = (eType == svDoubleRef ?
-t->GetDoubleRef().Ref2 : rRef1);
-switch( eType )
+switch (t->GetType())
 {
 case svSingleRef:
-rRef1.CalcAbsIfRel( aCellPos );
-if ( rRef1.Valid() )
-{
-pDoc->EndListeningCell(
-ScAddress( rRef1.nCol,
-   rRef1.nRow,
-   rRef1.nTab ), this );
-}
+{
+ScAddress aCell = t->GetSingleRef().toAbs(aPos);
+if (aCell.IsValid())
+pDoc->EndListeningCell(aCell, this);
+}
 break;
 case svDoubleRef:
-t->CalcAbsIfRel( aCellPos );
-if ( rRef1.Valid() && rRef2.Valid() )
-{
-if ( t->GetOpCode() == ocColRowNameAuto )
-{   // automagically
-if ( rRef1.IsColRel() )
-{   // ColName
-pDoc->EndListeningArea( ScRange (
-rRef1.nCol,
-rRef1.nRow,
-rRef1.nTab,
-rRef2.nCol,
-MAXROW,
-rRef2.nTab ), this );
-}
-else
-{   // RowName
-pDoc->EndListeningArea( ScRange (
-rRef1.nCol,
-rRef1.nRow,
-rRef1.nTab,
-MAXCOL,
-rRef2.nRow,
-rRef2.nTab ), this );
-}
-}
-else
-{
-pDoc->EndListeningArea( ScRange (
-rRef1.nCol,
-rRef1.nRow,
-rRef1.nTab,
-rRef2.nCol,
-rRef2.nRow,
-rRef2.nTab ), this );
-}
-}
+endListeningArea(this, *pDoc, aCellPos, *t);
 break;
 default:
 ;   // nothing
@@ -3348,39 +3331,17 @@ void ScFormulaCell::EndListeningTo( 
sc::EndListeningContext& rCxt )
 ScToken* t;
 while ( ( t = static_cast(pCode->GetNextReferenceRPN()) ) != 
NULL )
 {
-StackVar eType = t->GetType();
-ScSingleRefData& rRef1 = t->GetSingleRef();
-ScSingleRefData& rRef2 = (eType == svDoubleRef ? 
t->GetDoubleRef().Ref2 : rRef1);
-switch (eType)
+switch (t->GetType())
 {
 case svSingleRef:
 {
-ScAddress aCell = rRef1.toAbs(aPos);
+ScAddress aCell = t->GetSingleRef().toA

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 91/23449daa07ec053dd5d9b1db7fe7a24bd34842

[Caolán McNamara]

 91/23449daa07ec053dd5d9b1db7fe7a24bd34842 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19d084a4fd24763517dc68eb5e1558abd2a007e3
Author: Caolán McNamara 
Date:   Tue May 14 20:51:29 2013 +0100

Notes added by 'git notes add'

diff --git a/91/23449daa07ec053dd5d9b1db7fe7a24bd34842 
b/91/23449daa07ec053dd5d9b1db7fe7a24bd34842
new file mode 100644
index 000..5632f00
--- /dev/null
+++ b/91/23449daa07ec053dd5d9b1db7fe7a24bd34842
@@ -0,0 +1 @@
+reject: fixed that while merging
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/3625e6cf098c3fd5e6701b7b687a0423d78f51

[Caolán McNamara]

 8f/3625e6cf098c3fd5e6701b7b687a0423d78f51 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c83678bcc7cff9181016e4f72479f2cf6e5710fd
Author: Caolán McNamara 
Date:   Tue May 14 20:50:27 2013 +0100

Notes added by 'git notes add'

diff --git a/8f/3625e6cf098c3fd5e6701b7b687a0423d78f51 
b/8f/3625e6cf098c3fd5e6701b7b687a0423d78f51
new file mode 100644
index 000..57c57ef
--- /dev/null
+++ b/8f/3625e6cf098c3fd5e6701b7b687a0423d78f51
@@ -0,0 +1 @@
+merged as: decee367674661cf2535c0b8686eb9cec8658c09
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ba/6704b01ebc30b06485ef7f914b873201a08e85

[Caolán McNamara]

 ba/6704b01ebc30b06485ef7f914b873201a08e85 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23c1bc835fe3fc47cd856d8a1cdbdd8aadc96414
Author: Caolán McNamara 
Date:   Tue May 14 20:49:49 2013 +0100

Notes added by 'git notes add'

diff --git a/ba/6704b01ebc30b06485ef7f914b873201a08e85 
b/ba/6704b01ebc30b06485ef7f914b873201a08e85
new file mode 100644
index 000..122261f
--- /dev/null
+++ b/ba/6704b01ebc30b06485ef7f914b873201a08e85
@@ -0,0 +1 @@
+merged as: 92d660b5f1d2e4848041a69fb54d543f19fbb0a6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/63a83fb20825c66d8a3ecc50327753f7508bf9

[Caolán McNamara]

 07/63a83fb20825c66d8a3ecc50327753f7508bf9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0e0683bffe8fe7e42a13e93d9b24b8fdafe7900a
Author: Caolán McNamara 
Date:   Tue May 14 20:49:22 2013 +0100

Notes added by 'git notes add'

diff --git a/07/63a83fb20825c66d8a3ecc50327753f7508bf9 
b/07/63a83fb20825c66d8a3ecc50327753f7508bf9
new file mode 100644
index 000..788cf56
--- /dev/null
+++ b/07/63a83fb20825c66d8a3ecc50327753f7508bf9
@@ -0,0 +1 @@
+merged as: dca16f8c819a1c657c5d0eb7e3c6ff884843f9a7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' -

[Caolán McNamara]

 0 files changed

New commits:
commit 93630c533048c3bc62c38bf0afd610104f0d067d
Author: Caolán McNamara 
Date:   Tue May 14 20:48:57 2013 +0100

Notes added by 'git notes add'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7f/e1777ad29d92d16fbc11b7279375d37d11cef8

[Caolán McNamara]

 7f/e1777ad29d92d16fbc11b7279375d37d11cef8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0fd877c7446efd474a87dab8d54494277065c5b3
Author: Caolán McNamara 
Date:   Tue May 14 20:47:49 2013 +0100

Notes added by 'git notes add'

diff --git a/7f/e1777ad29d92d16fbc11b7279375d37d11cef8 
b/7f/e1777ad29d92d16fbc11b7279375d37d11cef8
new file mode 100644
index 000..a2415aa
--- /dev/null
+++ b/7f/e1777ad29d92d16fbc11b7279375d37d11cef8
@@ -0,0 +1 @@
+merged as: 5f7fc90810a4bab148e0de745b980813cd4ad542
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/18055a153f4e66ec72b0c20673032d6edeebab

[Caolán McNamara]

 2f/18055a153f4e66ec72b0c20673032d6edeebab |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 56e0b891ae74752291dd575f97c6917bd2a9a350
Author: Caolán McNamara 
Date:   Tue May 14 20:47:29 2013 +0100

Notes added by 'git notes add'

diff --git a/2f/18055a153f4e66ec72b0c20673032d6edeebab 
b/2f/18055a153f4e66ec72b0c20673032d6edeebab
new file mode 100644
index 000..f1cb6d8
--- /dev/null
+++ b/2f/18055a153f4e66ec72b0c20673032d6edeebab
@@ -0,0 +1 @@
+merged as: 17383db8f19de33c2adac783ac91c2cbf3cab438
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a9/7c4ca2c235a4654243cbbdf970800454b5aa56

[Caolán McNamara]

 a9/7c4ca2c235a4654243cbbdf970800454b5aa56 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fe9ff1384ab1e5001d1da630993253019740bfc3
Author: Caolán McNamara 
Date:   Tue May 14 20:47:03 2013 +0100

Notes added by 'git notes add'

diff --git a/a9/7c4ca2c235a4654243cbbdf970800454b5aa56 
b/a9/7c4ca2c235a4654243cbbdf970800454b5aa56
new file mode 100644
index 000..755a910
--- /dev/null
+++ b/a9/7c4ca2c235a4654243cbbdf970800454b5aa56
@@ -0,0 +1 @@
+merged as: 2117bfe77d3dfc5eb778e27105bf6c91cafb0ec7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - de/52e4d0e544f6a6c2ab51631870d682885c30cd

[Caolán McNamara]

 de/52e4d0e544f6a6c2ab51631870d682885c30cd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c92a1e3eedde124a8f1078a446ece48754859f53
Author: Caolán McNamara 
Date:   Tue May 14 20:46:26 2013 +0100

Notes added by 'git notes add'

diff --git a/de/52e4d0e544f6a6c2ab51631870d682885c30cd 
b/de/52e4d0e544f6a6c2ab51631870d682885c30cd
new file mode 100644
index 000..fcdf8bd
--- /dev/null
+++ b/de/52e4d0e544f6a6c2ab51631870d682885c30cd
@@ -0,0 +1 @@
+merged as: 8f430d9ca3360c46125718b79193130dd00d8ab2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/source

[Oliver-Rainer Wittmann]

 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |   33 +---
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |  118 +++-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |7 
 3 files changed, 69 insertions(+), 89 deletions(-)

New commits:
commit 8f430d9ca3360c46125718b79193130dd00d8ab2
Author: Oliver-Rainer Wittmann 
Date:   Tue May 14 13:37:28 2013 +

correct context switch handling in paragraph property panel...

and position and size property panel

(cherry picked from commit de52e4d0e544f6a6c2ab51631870d682885c30cd)

Change-Id: I9330bcb21103da65b00251786340076c8b1a4346

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index e2fc093..4e42921 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -470,24 +470,19 @@ void ParaLineSpacingControl::Rearrange(SfxItemState 
currSPState,FieldUnit currMe
 
 aLineDist.SaveValue();
 
-sal_uInt16 uCount = aLineDist.GetEntryCount();
+const sal_uInt16 uCount = aLineDist.GetEntryCount();
 if( uCount == LLINESPACE_FIX + 1 )
 {
-switch (currentContext.GetCombinedContext())
+switch (currentContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Impress, Context_Table):
-case CombinedEnumContext(Application_Draw, Context_Table):
-case CombinedEnumContext(Application_Writer, Context_DrawText):
-case CombinedEnumContext(Application_Calc, Context_DrawText):
-case CombinedEnumContext(Application_Draw, Context_DrawText):
-case CombinedEnumContext(Application_Impress, 
Context_DrawText):
-case CombinedEnumContext(Application_Writer, Context_Annotation):
-case CombinedEnumContext(Application_Draw, Context_Draw):
-case CombinedEnumContext(Application_Draw, Context_TextObject):
-case CombinedEnumContext(Application_Draw, Context_Graphic):
-case CombinedEnumContext(Application_Impress, Context_Draw):
-case CombinedEnumContext(Application_Impress, 
Context_TextObject):
-case CombinedEnumContext(Application_Impress, Context_Graphic):
+case CombinedEnumContext(Application_DrawImpress, Context_Table):
+case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+case CombinedEnumContext(Application_Calc, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Annotation):
 {
 aLineDist.RemoveEntry(LLINESPACE_FIX);
 }
@@ -495,11 +490,11 @@ void ParaLineSpacingControl::Rearrange(SfxItemState 
currSPState,FieldUnit currMe
 }
 else if( uCount == LLINESPACE_FIX)
 {
-switch (currentContext.GetCombinedContext())
+switch (currentContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Writer, Context_Default):
-case CombinedEnumContext(Application_Writer, Context_Text):
-case CombinedEnumContext(Application_Writer, Context_Table):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Default):
+case CombinedEnumContext(Application_WriterVariants, Context_Text):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Table):
 {
 aLineDist.InsertEntry(OUString("Fixed"), LLINESPACE_FIX);
 }
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 7fab7bf..7eff617 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -820,20 +820,20 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, 
ToolBox *, pControl)
 {
 switch (pControl->GetCurItemId())
 {
-case INDENT_INCREMENT:
+case INDENT_INCREMENT:
 {
-switch (maContext.GetCombinedContext())
+switch (maContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Writer, Context_Default):
-case CombinedEnumContext(Application_Writer, Context_Text):
-case CombinedEnumContext(Application_Writer, Context_Table):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Default):
+case CombinedEnumContext(Application_WriterVariants, Context_Text):
+case CombinedEnumContext(Application_WriterVaria

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4a/87b75b86e4c932b5230cb7caecf6f00e40a096

[Caolán McNamara]

 4a/87b75b86e4c932b5230cb7caecf6f00e40a096 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fc4023564f5d9a36f398408dbfba874e0013b655
Author: Caolán McNamara 
Date:   Tue May 14 20:44:25 2013 +0100

Notes added by 'git notes add'

diff --git a/4a/87b75b86e4c932b5230cb7caecf6f00e40a096 
b/4a/87b75b86e4c932b5230cb7caecf6f00e40a096
new file mode 100644
index 000..56138f5
--- /dev/null
+++ b/4a/87b75b86e4c932b5230cb7caecf6f00e40a096
@@ -0,0 +1 @@
+merged as: 293bf865c55a10784b32ba1130b0ab5c23d7b22f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 officecfg/registry sfx2/source

[Oliver-Rainer Wittmann]

 include/sfx2/sidebar/EnumContext.hxx   |1 +
 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |1 +
 sfx2/source/sidebar/EnumContext.cxx|3 +++
 sfx2/source/sidebar/ResourceManager.cxx|1 +
 4 files changed, 6 insertions(+)

New commits:
commit 293bf865c55a10784b32ba1130b0ab5c23d7b22f
Author: Oliver-Rainer Wittmann 
Date:   Tue May 14 13:21:45 2013 +

Resolves: #i122056# adding another Writer variant for sidebar context 
handling

Patch by: Ariel
Review by: Oliver
(cherry picked from commit 4a87b75b86e4c932b5230cb7caecf6f00e40a096)

Conflicts:
sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: I51cd1d63ddd23a0907f1781c46891b6f5c9870c5

diff --git a/include/sfx2/sidebar/EnumContext.hxx 
b/include/sfx2/sidebar/EnumContext.hxx
index 819e837..b11f3bf 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -37,6 +37,7 @@ public:
 Application_WriterWeb,
 Application_WriterXML,
 Application_WriterForm,
+Application_WriterReport,
 Application_Calc,
 Application_Draw,
 Application_Impress,
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index de7d7fa..6559912 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -83,6 +83,7 @@
  com.sun.star.text.WebDocument
  com.sun.star.xforms.XMLFormDocument
  com.sun.star.sdb.FormDesign
+ com.sun.star.sdb.TextReportDesign
  com.sun.star.sheet.SpreadsheetDocument
  com.sun.star.presentation.PresentationDocument
  com.sun.star.drawing.DrawingDocument
diff --git a/sfx2/source/sidebar/EnumContext.cxx 
b/sfx2/source/sidebar/EnumContext.cxx
index ce1d743..514cd13 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -92,6 +92,8 @@ sal_Int32 EnumContext::GetCombinedContext_DI (void) const
 case Application_WriterGlobal:
 case Application_WriterWeb:
 case Application_WriterXML:
+case Application_WriterForm:
+case Application_WriterReport:
 return CombinedEnumContext(Application_WriterVariants, meContext);
 
 default:
@@ -158,6 +160,7 @@ void EnumContext::ProvideApplicationContainers (void)
 AddEntry(A2S("com.sun.star.text.WebDocument"), 
EnumContext::Application_WriterWeb);
 AddEntry(A2S("com.sun.star.xforms.XMLFormDocument"), 
EnumContext::Application_WriterXML);
 AddEntry(A2S("com.sun.star.sdb.FormDesign"), 
EnumContext::Application_WriterForm);
+AddEntry(A2S("com.sun.star.sdb.TextReportDesign"), 
EnumContext::Application_WriterReport);
 AddEntry(A2S("com.sun.star.sheet.SpreadsheetDocument"), 
EnumContext::Application_Calc);
 AddEntry(A2S("com.sun.star.drawing.DrawingDocument"), 
EnumContext::Application_Draw);
 AddEntry(A2S("com.sun.star.presentation.PresentationDocument"), 
EnumContext::Application_Impress);
diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index d65c9b4..eaf4bea 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -436,6 +436,7 @@ void ResourceManager::ReadContextList (
 aApplications.push_back(EnumContext::Application_WriterWeb);
 aApplications.push_back(EnumContext::Application_WriterXML);
 aApplications.push_back(EnumContext::Application_WriterForm);
+aApplications.push_back(EnumContext::Application_WriterReport);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6c/a31d904b343c76899dfa2bfef3e7d20db23364

[Caolán McNamara]

 6c/a31d904b343c76899dfa2bfef3e7d20db23364 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 95f6d0b65bd6d50f6bc4d2f9cd8f819d32e011e3
Author: Caolán McNamara 
Date:   Tue May 14 20:42:22 2013 +0100

Notes added by 'git notes add'

diff --git a/6c/a31d904b343c76899dfa2bfef3e7d20db23364 
b/6c/a31d904b343c76899dfa2bfef3e7d20db23364
new file mode 100644
index 000..5bc77d1
--- /dev/null
+++ b/6c/a31d904b343c76899dfa2bfef3e7d20db23364
@@ -0,0 +1 @@
+merged as: 328d162119b0130df5d69c80a66d6e22b66203a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - 2 commits - sd/source svx/inc svx/source

[Oliver-Rainer Wittmann]

 sd/source/ui/view/drviewsa.cxx  |8 --
 svx/inc/svx/sidebar/SelectionAnalyzer.hxx   |5 +
 svx/source/sidebar/SelectionAnalyzer.cxx|   12 ++-
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |   61 +++-
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx |2 
 svx/source/sidebar/paragraph/ParaPropertyPanel.hrc  |1 
 6 files changed, 32 insertions(+), 57 deletions(-)

New commits:
commit 328d162119b0130df5d69c80a66d6e22b66203a3
Author: Oliver-Rainer Wittmann 
Date:   Tue May 14 12:10:04 2013 +

Resolves: #i122270# paragraph property panel, line spacing control

do not directly select item via cursor travelling; removing obsolete code

(cherry picked from commit 6ca31d904b343c76899dfa2bfef3e7d20db23364)

Conflicts:
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx

Change-Id: I8b8ff06008dc0fdfc617f83a4a9c0f9569a8bd36

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index cbb9320..e2fc093 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -67,7 +67,6 @@ ParaLineSpacingControl::ParaLineSpacingControl(Window* 
pParent, svx::sidebar::Pa
 , maSpacing115 (SVX_RES(IMG_SPACING115))
 , maSpacing15  (SVX_RES(IMG_SPACING15))
 , maSpacing2   (SVX_RES(IMG_SPACING2))
-, maLPCustom   (SVX_RES(IMG_SPACINGLCUSTOM))
 , maSelSpacing1(SVX_RES(IMG_SEL_SPACING1))
 , maSelSpacing115  (SVX_RES(IMG_SEL_SPACING115))
 , maSelSpacing15   (SVX_RES(IMG_SEL_SPACING15))
@@ -100,26 +99,20 @@ ParaLineSpacingControl::~ParaLineSpacingControl()
 
 void ParaLineSpacingControl::initial()
 {
-//maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |  
WB_NO_DIRECTSELECT  );
-
//maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetMenuColor());
-//maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetMenuColor());
-//maLineSpacing.SetMinFont();
-
-
maLineSpacing.SetControlBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-GetSettings().GetStyleSettings().GetMenuColor():
-sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
maLineSpacing.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
-GetSettings().GetStyleSettings().GetMenuColor():
-sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
maLineSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-GetSettings().GetStyleSettings().GetMenuColor():
-sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
//maFTSpacing.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-//GetSettings().GetStyleSettings().GetMenuColor():
-//sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
-
//maFTBy.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
-//GetSettings().GetStyleSettings().GetMenuColor():
-//sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
+maLineSpacing.SetStyle( maLineSpacing.GetStyle()| WB_3DLOOK |  
WB_NO_DIRECTSELECT  );
+
+maLineSpacing.SetControlBackground(
+GetSettings().GetStyleSettings().GetHighContrastMode()
+? GetSettings().GetStyleSettings().GetMenuColor()
+: sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
+maLineSpacing.SetColor(
+GetSettings().GetStyleSettings().GetHighContrastMode()
+? GetSettings().GetStyleSettings().GetMenuColor()
+: sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
+maLineSpacing.SetBackground(
+GetSettings().GetStyleSettings().GetHighContrastMode()
+? GetSettings().GetStyleSettings().GetMenuColor()
+: sfx2::sidebar::Theme::GetColor( 
sfx2::sidebar::Theme::Paint_PanelBackground ));
 
 mpImg = new Image[4];
 mpImg[0] = maSpacing1;
@@ -162,13 +155,7 @@ void ParaLineSpacingControl::initial()
 aLineDistAtPercentBox.SetModifyHdl( aLink );
 aLineDistAtMetricBox.SetModifyHdl( aLink );
 }
-void ParaLineSpacingControl::ToGetFocus(bool bType)
-{
-if(!bType)
-aLineDist.GrabFocus();
-else
-maLineSpacing.GrabFocus();  //wj
-}
+
 
 void ParaLineSpacingControl::PopupModeEndCallback()
 {
@@ -483,24 +470,6 @@ void ParaLineSpacingControl::Rearrange(SfxItemState 
currSPState,FieldUnit currMe
 
 aLineDist.SaveValue();
 
-/*sal_uInt16 nID = pBox->GetCurItemId();
-pBox->SetItemDown(nID, sal_True);
-
-Size aFloatSz = GetOutputSizePixel();
-
-GetLineSPFloatWin()->SetSizePixel( aFloatSz );
-
-Point aPos=maLineSPTbx->GetPosPixel();
-aPos.setX(aPos.getX());
-aPos = OutputToScreenPixe

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c4/99090bea18b7c61c51053ad03446b6e64750d3

[Caolán McNamara]

 c4/99090bea18b7c61c51053ad03446b6e64750d3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1762dcb3cd731061054a35e229efe8f96894d59
Author: Caolán McNamara 
Date:   Tue May 14 20:37:53 2013 +0100

Notes added by 'git notes add'

diff --git a/c4/99090bea18b7c61c51053ad03446b6e64750d3 
b/c4/99090bea18b7c61c51053ad03446b6e64750d3
new file mode 100644
index 000..a563010
--- /dev/null
+++ b/c4/99090bea18b7c61c51053ad03446b6e64750d3
@@ -0,0 +1 @@
+prefer: d50ce284c9674c45acd40d017cc44c260da722a2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cd/ce1b91f169a88ca5b4523c687d0de766c878d5

[Caolán McNamara]

 cd/ce1b91f169a88ca5b4523c687d0de766c878d5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 89d88ba95fa6f1a6a8c9d450a46f870cb4ea7f49
Author: Caolán McNamara 
Date:   Tue May 14 20:36:32 2013 +0100

Notes added by 'git notes add'

diff --git a/cd/ce1b91f169a88ca5b4523c687d0de766c878d5 
b/cd/ce1b91f169a88ca5b4523c687d0de766c878d5
new file mode 100644
index 000..9b2da66
--- /dev/null
+++ b/cd/ce1b91f169a88ca5b4523c687d0de766c878d5
@@ -0,0 +1 @@
+reject: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d2/2d2bb3621602a4e2154123976423365d54f552

[Caolán McNamara]

 d2/2d2bb3621602a4e2154123976423365d54f552 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5209a85b0d8a8cf466282b0febe31f3a71793fa4
Author: Caolán McNamara 
Date:   Tue May 14 20:34:52 2013 +0100

Notes added by 'git notes add'

diff --git a/d2/2d2bb3621602a4e2154123976423365d54f552 
b/d2/2d2bb3621602a4e2154123976423365d54f552
new file mode 100644
index 000..06dd416
--- /dev/null
+++ b/d2/2d2bb3621602a4e2154123976423365d54f552
@@ -0,0 +1 @@
+prefer: c367a1e8628f125373a8be0108b05f27ca2117dd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/DeckTitleBar.cxx  |   15 +--
 sfx2/source/sidebar/PanelTitleBar.cxx |5 +
 sfx2/source/sidebar/Sidebar.hrc   |3 +++
 sfx2/source/sidebar/Sidebar.src   |9 +
 4 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 17383db8f19de33c2adac783ac91c2cbf3cab438
Author: Andre Fischer 
Date:   Mon May 13 14:41:07 2013 +

Resolves: #i122298# Added quick help texts to title bar buttons of 
sidebar...

panels and deck

(cherry picked from commit 2f18055a153f4e66ec72b0c20673032d6edeebab)

Change-Id: Ic573030d5b8a437e09a763fb0350c22ef33e151a

diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 0370ef8..ed7fd17 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -18,6 +18,8 @@
 
 #include "DeckTitleBar.hxx"
 #include "sfx2/sidebar/Theme.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
 
 #include 
 
@@ -39,16 +41,12 @@ DeckTitleBar::DeckTitleBar (
 : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
   mnCloserItemIndex(1),
   maCloserAction(rCloserAction),
-  mbIsCloserVisible(rCloserAction)
+  mbIsCloserVisible(false)
 {
 OSL_ASSERT(pParentWindow != NULL);
 
 if (maCloserAction)
-{
-maToolBox.InsertItem(
-mnCloserItemIndex,
-Theme::GetImage(Theme::Image_Closer));
-}
+SetCloserVisible(true);
 
 #ifdef DEBUG
 SetText(A2S("DeckTitleBar"));
@@ -72,9 +70,14 @@ void DeckTitleBar::SetCloserVisible (const bool 
bIsCloserVisible)
 mbIsCloserVisible = bIsCloserVisible;
 
 if (mbIsCloserVisible)
+{
 maToolBox.InsertItem(
 mnCloserItemIndex,
 Theme::GetImage(Theme::Image_Closer));
+maToolBox.SetQuickHelpText(
+mnCloserItemIndex,
+String(SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK)));
+}
 else
 maToolBox.RemoveItem(
 maToolBox.GetItemPos(mnCloserItemIndex));
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 0175741..9b67e3c 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -17,6 +17,8 @@
  */
 
 #include "PanelTitleBar.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "Sidebar.hrc"
 
 #include "Paint.hxx"
 #include "Panel.hxx"
@@ -73,6 +75,9 @@ void PanelTitleBar::SetMenuAction ( const 
::boost::function& rMenuAc
 mnMenuItemIndex,
 Theme::GetImage(Theme::Image_PanelMenu));
 maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
+maToolBox.SetQuickHelpText(
+mnMenuItemIndex,
+String(SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS)));
 }
 else if ( maMenuAction && !rMenuAction )
 {
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index 852648c..c9c4d79 100644
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -51,3 +51,6 @@
 #define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL  132
 #define STRING_CUSTOMIZATION200
 #define STRING_RESTORE  201
+
+#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START +  1)
+#define SFX_STR_SIDEBAR_CLOSE_DECK   (RID_SFX_SIDEBAR_START +  2)
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 64eef88..6ec57c1 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -155,4 +155,13 @@ Resource RID_SIDEBAR_RESOURCE
 };
 };
 
+String SFX_STR_SIDEBAR_MORE_OPTIONS
+{
+Text [en-US] = "More Options";
+};
+
+String SFX_STR_SIDEBAR_CLOSE_DECK
+{
+Text [en-US] = "Close Sidebar Deck";
+};
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source

[Andre Fischer]

 sd/source/ui/view/drviews1.cxx |5 +
 sd/source/ui/view/drviewsa.cxx |5 -
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5f7fc90810a4bab148e0de745b980813cd4ad542
Author: Andre Fischer 
Date:   Mon May 13 13:34:46 2013 +

Resolves: #i122275# Don't show the layout panel for master pages

(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8)

Conflicts:
sd/source/ui/view/drviewsa.cxx

Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index faf114f..552f61b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -458,6 +458,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool 
bIsLayerModeActive)
 Invalidate( SID_TITLE_MASTERPAGE );
 Invalidate( SID_NOTES_MASTERPAGE );
 Invalidate( SID_HANDOUT_MASTERPAGE );
+
+if (meEditMode == EM_PAGE)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 }
 }
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index a747165..a580d60 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -137,7 +137,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, 
ViewShellBase& rViewShellBas
 
 mpSelectionChangeHandler->Connect();
 
-
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+else
+
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
 
 doShow();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/SidebarController.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dca16f8c819a1c657c5d0eb7e3c6ff884843f9a7
Author: Andre Fischer 
Date:   Mon May 13 11:00:09 2013 +

Resolves: #i122272# Select correct sidebar button...

after changing decks via menu.

(cherry picked from commit 0763a83fb20825c66d8a3ecc50327753f7508bf9)

Change-Id: Ief24fa9191848ad6004ea7c28cd28b73b7e54f9f

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 6656714..b508cf4 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -480,6 +480,7 @@ void SidebarController::SwitchToDeck (
 
 msCurrentDeckId = rDeckDescriptor.msId;
 }
+mpTabBar->HighlightDeck(msCurrentDeckId);
 
 // Determine the panels to display in the deck.
 ResourceManager::PanelContextDescriptorContainer aPanelContextDescriptors;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - svx/Library_svx.mk

[Andre Fischer]

 svx/Library_svx.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 92d660b5f1d2e4848041a69fb54d543f19fbb0a6
Author: Andre Fischer 
Date:   Mon May 13 07:41:14 2013 +

Related: #i122047# Remove last traces of unused toolbox controller

(cherry picked from commit ba6704b01ebc30b06485ef7f914b873201a08e85)

Change-Id: I6107fd3f840e07f546e8ae7aa8e6eb60f8b4d566

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index b4b4051..76f54c9 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -202,7 +202,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/sidebar/tools/Popup \
 svx/source/sidebar/tools/ValueSetWithTextControl \
 svx/source/sidebar/insert/InsertPropertyPanel \
-svx/source/sidebar/insert/SimpleToolBoxController \
 svx/source/stbctrls/pszctrl \
 svx/source/stbctrls/insctrl \
 svx/source/stbctrls/selctrl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/19eca42b149bc84f4aa3ead5c29bd64147bedc

[Caolán McNamara]

 0e/19eca42b149bc84f4aa3ead5c29bd64147bedc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f8ffc6e5d49e5ea2cb61b2c18bf7bd87569547aa
Author: Caolán McNamara 
Date:   Tue May 14 20:27:03 2013 +0100

Notes added by 'git notes add'

diff --git a/0e/19eca42b149bc84f4aa3ead5c29bd64147bedc 
b/0e/19eca42b149bc84f4aa3ead5c29bd64147bedc
new file mode 100644
index 000..f470514
--- /dev/null
+++ b/0e/19eca42b149bc84f4aa3ead5c29bd64147bedc
@@ -0,0 +1 @@
+reject: not using precompiled headers, that way anyway
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 10/7eb08386046f1e78dc32b21f569c6aa7352cd1

[Caolán McNamara]

 10/7eb08386046f1e78dc32b21f569c6aa7352cd1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c11cd6fff86543d8f6b5ee1c5803387f7ef3d1f5
Author: Caolán McNamara 
Date:   Tue May 14 20:24:44 2013 +0100

Notes added by 'git notes add'

diff --git a/10/7eb08386046f1e78dc32b21f569c6aa7352cd1 
b/10/7eb08386046f1e78dc32b21f569c6aa7352cd1
new file mode 100644
index 000..136ea36
--- /dev/null
+++ b/10/7eb08386046f1e78dc32b21f569c6aa7352cd1
@@ -0,0 +1 @@
+merged as: 43d022d31ac774837273e35f8a1d738efd811de1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - 2 commits - include/sfx2 sc/source sfx2/Library_sfx.mk sfx2/source

[Andre Fischer]

 include/sfx2/sidebar/IContextChangeReceiver.hxx  |7 ++--
 include/sfx2/sidebar/ILayoutableWindow.hxx   |5 ++-
 include/sfx2/sidebar/SidebarPanelBase.hxx|3 +-
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx  |1 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |1 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx   |1 
 sfx2/Library_sfx.mk  |2 +
 sfx2/source/sidebar/AsynchronousCall.cxx |2 -
 sfx2/source/sidebar/IContextChangeReceiver.cxx   |   28 +++
 sfx2/source/sidebar/ILayoutableWindow.cxx|   28 +++
 sfx2/source/sidebar/SidebarPanelBase.cxx |8 -
 11 files changed, 68 insertions(+), 18 deletions(-)

New commits:
commit 43d022d31ac774837273e35f8a1d738efd811de1
Author: Andre Fischer 
Date:   Mon May 13 07:40:20 2013 +

Related: #i122047# Added missing implementation of virtual destructors

(cherry picked from commit 107eb08386046f1e78dc32b21f569c6aa7352cd1)

Change-Id: Icc57d8910a390e9b608b5aa4a0fa6d8c8659208d

diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx 
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 54f5883..a4b85bd 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -66,7 +66,7 @@ void AsynchronousCall::CancelRequest (void)
 if (mnCallId != 0)
 {
 Application::RemoveUserEvent(mnCallId);
-mnCallId = -1;
+mnCallId = 0;
 }
 }
 
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx 
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
new file mode 100644
index 000..1aa7a50
--- /dev/null
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include 
+
+
+namespace sfx2 { namespace sidebar {
+
+
+IContextChangeReceiver::~IContextChangeReceiver (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx 
b/sfx2/source/sidebar/ILayoutableWindow.cxx
new file mode 100644
index 000..dccd15d
--- /dev/null
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include 
+
+
+namespace sfx2 { namespace sidebar {
+
+
+ILayoutableWindow::~ILayoutableWindow (void)
+{
+}
+
+} } // end of namespace ::sd::sidebar
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx 
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 6a17fb7..9aef9fa 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -240,12 +240,4 @@ ui::LayoutSize SAL_CALL 
SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
 return ui::LayoutSize(0,0,0);
 }
 
-IContextChangeReceiver::~IContextChangeReceiver()
-{
-}
-
-ILayoutableWindow::~ILayoutableWindow()
-{
-}
-
 } } // end of namespace sfx2::sidebar
commit decee367674661cf2535c0b8686eb9cec8658c09
Author: Andre Fischer 
Date:   Fri May 10 11:03:45 2013 +

Resolves: #i122047# Adding virtual destructors to interfaces...

to prevent problems with older compilers

(cherry picked from commit 8f3625e6cf098c3fd5e6701b7b687a0423d78f51)

Conflicts:
sfx2/inc/sfx2/sidebar/IContextChangeReceiver.hxx
sfx2/inc/sfx2/sidebar/ILayoutableWindow.hxx
sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx

   

[Libreoffice-commits] core.git: sw/source

[Tomaž Vajngerl]

 sw/source/ui/dochdl/swdtflvr.cxx |   66 ---
 1 file changed, 48 insertions(+), 18 deletions(-)

New commits:
commit 5d2f3957bdda0eb2e7d68b0dcf7ae6a0b50ef48b
Author: Tomaž Vajngerl 
Date:   Tue May 14 20:36:58 2013 +0200

Detect and rotate image at drag&drop or copy&paste in Writer.

Change-Id: Iaacbb78921f966703d4f1080f97d26ea4895281f

diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index c61c0ec..31e0fa6 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -110,11 +110,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+#include 
+
 extern bool bFrmDrag;
 extern bool bDDINetAttr;
 extern bool bExecuteDrag;
@@ -368,6 +372,24 @@ namespace
 
 rSrcWrtShell.Copy(&rDest);
 }
+
+void lclCheckAndPerformRotation(Graphic& aGraphic)
+{
+GraphicNativeMetadata aMetadata;
+if ( aMetadata.read(aGraphic) )
+{
+sal_uInt16 aRotation = aMetadata.getRotation();
+if (aRotation != 0)
+{
+QueryBox aQueryBox(0, WB_YES_NO | WB_DEF_YES, 
SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) );
+if (aQueryBox.Execute() == RET_YES)
+{
+GraphicNativeTransform aTransform( aGraphic );
+aTransform.rotate( aRotation );
+}
+}
+}
+}
 }
 
 sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
@@ -1864,38 +1886,42 @@ int SwTransferable::_PasteTargetURL( 
TransferableDataHelper& rData,
 SwTransferable::_CheckForURLOrLNKFile( rData, sURL );
 
 //!!! check at FileSystem - only then it make sense to test 
graphics !!!
-Graphic aGrf;
+Graphic aGraphic;
 GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
-nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyStr, 
aGrf, &rFlt );
+nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyStr, 
aGraphic, &rFlt );
+
 if( nRet )
 {
+//Check and Perform rotation if needed
+lclCheckAndPerformRotation(aGraphic);
+
 switch( nAction )
 {
 case SW_PASTESDR_INSERT:
 SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-rSh.Insert( sURL, aEmptyStr, aGrf );
+rSh.Insert( sURL, aEmptyStr, aGraphic );
 break;
 
 case SW_PASTESDR_REPLACE:
 if( rSh.IsObjSelected() )
 {
-rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGrf );
+rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGraphic );
 Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() );
 SwTransferable::SetSelInShell( rSh, sal_True, &aPt );
 }
 else
-rSh.ReRead( sURL, aEmptyStr, &aGrf );
+rSh.ReRead( sURL, aEmptyStr, &aGraphic );
 break;
 
 case SW_PASTESDR_SETATTR:
 if( rSh.IsObjSelected() )
-rSh.Paste( aGrf );
+rSh.Paste( aGraphic );
 else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() )
-rSh.ReRead( sURL, aEmptyStr, &aGrf );
+rSh.ReRead( sURL, aEmptyStr, &aGraphic );
 else
 {
 SwTransferable::SetSelInShell( rSh, sal_False, pPt );
-rSh.Insert( sURL, aEmptyStr, aGrf );
+rSh.Insert( sURL, aEmptyStr, aGraphic );
 }
 break;
 default:
@@ -2147,7 +2173,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 {
 int nRet = 0;
 
-Graphic aGrf;
+Graphic aGraphic;
 INetBookmark aBkmk;
 sal_Bool bCheckForGrf = sal_False, bCheckForImageMap = sal_False;
 
@@ -2155,7 +2181,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 {
 case SOT_FORMAT_BITMAP:
 case SOT_FORMAT_GDIMETAFILE:
-nRet = rData.GetGraphic( nFmt, aGrf );
+nRet = rData.GetGraphic( nFmt, aGraphic );
 break;
 
 case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK:
@@ -2188,7 +2214,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 break;
 
 default:
-nRet = rData.GetGraphic( nFmt, aGrf );
+nRet = rData.GetGraphic( nFmt, aGraphic );
 break;
 }
 
@@ -2197,7 +2223,8 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& 
rData, SwWrtShell& rSh,
 //!!! check at FileSystem - only then it makes sense to test the 
graphics !!!
 

[PATCH] drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

[David Tardon (via Code Review)]

Hello LibreOffice gerrit bot,

I'd like you to reexamine a rebased change.  Please visit

https://gerrit.libreoffice.org/3908

to look at the new rebased patch set (#2).

Change subject: drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING
..

drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

See
http://lists.freedesktop.org/archives/libreoffice/2013-May/051706.html
for explanation.

Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
---
M config_host.mk.in
M solenv/bin/modules/installer/scriptitems.pm
M solenv/bin/ooinstall
3 files changed, 2 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/3908/2
-- 
To view, visit https://gerrit.libreoffice.org/3908
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/qa

[Kohei Yoshida]

 sc/inc/column.hxx|1 +
 sc/qa/unit/ucalc.cxx |   36 ++--
 2 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 33f20f466af9c2a73f9048d64a3516f1602198ba
Author: Kohei Yoshida 
Date:   Tue May 14 14:20:08 2013 -0400

Unit test for range deletion of broadcasters.

Change-Id: I615c9f9e95a44149c8079754e9aa6497f34c76cf

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9ee830b..b7539c6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -39,6 +39,7 @@
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
+#define MDDS_MULTI_TYPE_VECTOR_DEBUG 1
 #endif
 
 #include 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3e881c9..d051908 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1776,13 +1776,37 @@ void Test::testCellBroadcaster()
 // Clear everything again
 clearRange(m_pDoc, ScRange(0,0,0,10,100,0));
 
-m_pDoc->SetString(ScAddress(1,0,0), "=A1"); // B1 references A1.
-m_pDoc->SetValue(ScAddress(0,0,0), 12.3);
-CPPUNIT_ASSERT_EQUAL(12.3, m_pDoc->GetValue(ScAddress(1,0,0)));
+// Switch to R1C1 to make it easier to input relative references in 
multiple cells.
+FormulaGrammarSwitch aFGSwitch(m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
+
+// Have B1:B20 reference A1:A20.
+val = 0.0;
+for (SCROW i = 0; i < 20; ++i)
+{
+m_pDoc->SetValue(ScAddress(0,i,0), val++);
+m_pDoc->SetString(ScAddress(1,i,0), "=RC[-1]");
+}
 
-// Clear the entire column A.
-clearRange(m_pDoc, ScRange(0,0,0,0,MAXROW,0));
-CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,0,0)));
+// Ensure that the formula cells show correct values, and the referenced
+// cells have broadcasters.
+val = 0.0;
+for (SCROW i = 0; i < 20; ++i)
+{
+CPPUNIT_ASSERT_EQUAL(val++, m_pDoc->GetValue(ScAddress(1,i,0)));
+pBC = m_pDoc->GetBroadcaster(ScAddress(0,i,0));
+CPPUNIT_ASSERT_MESSAGE("Broadcast should exist here.", pBC);
+}
+
+// Delete formula cells in B2:B19.
+clearRange(m_pDoc, ScRange(1,1,0,1,18,0));
+// Ensure that A2:A19 no longer have broadcasters, but A1 and A20 still do.
+CPPUNIT_ASSERT_MESSAGE("A1 should still have broadcaster.", 
m_pDoc->GetBroadcaster(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_MESSAGE("A20 should still have broadcaster.", 
m_pDoc->GetBroadcaster(ScAddress(0,19,0)));
+for (SCROW i = 1; i <= 18; ++i)
+{
+pBC = m_pDoc->GetBroadcaster(ScAddress(0,i,0));
+CPPUNIT_ASSERT_MESSAGE("Broadcaster should have been deleted.", !pBC);
+}
 
 m_pDoc->DeleteTab(0);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/inc sfx2/source

[Andre Fischer]

 sfx2/inc/sfx2/sidebar/ControllerFactory.hxx |2 ++
 sfx2/source/sidebar/FocusManager.cxx|2 ++
 sfx2/source/sidebar/SidebarToolBox.cxx  |3 +++
 3 files changed, 7 insertions(+)

New commits:
commit a7d457da0e9d7d2ede3906d346869322801b9707
Author: Andre Fischer 
Date:   Tue May 14 16:23:55 2013 +

122302: Added missing includes.

diff --git a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx 
b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
index 802d3e7..8a08050 100644
--- a/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
@@ -29,6 +29,8 @@
 namespace css = ::com::sun::star;
 namespace cssu = ::com::sun::star::uno;
 
+class ToolBox;
+
 namespace sfx2 { namespace sidebar {
 
 /** Convenience class for easy creation of toolbox controllers.
diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index b1e6dd0..93ff036 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -194,10 +194,12 @@ FocusManager::FocusLocation 
FocusManager::GetFocusLocation (const Window& rWindo
 {
 // Check the deck title.
 if (mpDeckTitleBar != NULL)
+{
 if (mpDeckTitleBar == &rWindow)
 return FocusLocation(PC_DeckTitle, -1);
 else if (&mpDeckTitleBar->GetToolBox() == &rWindow)
 return FocusLocation(PC_DeckToolBox, -1);
+}
 
 // Search the panels.
 for (sal_Int32 nIndex=0,nCount(maPanels.size()); nIndex
+#include 
+#include 
+#include 
 
 
 using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - oox/source

[Luboš Luňák]

 oox/source/core/binarycodec.cxx |2 +-
 oox/source/drawingml/chart/objectformatter.cxx  |2 +-
 oox/source/drawingml/color.cxx  |4 ++--
 oox/source/drawingml/fillpropertiesgroupcontext.cxx |2 +-
 oox/source/helper/propertymap.cxx   |2 +-
 oox/source/helper/textinputstream.cxx   |2 +-
 oox/source/ole/olehelper.cxx|   10 +-
 oox/source/ole/vbacontrol.cxx   |2 +-
 oox/source/ole/vbahelper.cxx|4 ++--
 oox/source/vml/vmlformatting.cxx|   14 +++---
 oox/source/vml/vmlshape.cxx |   15 +--
 oox/source/vml/vmlshapecontext.cxx  |2 +-
 12 files changed, 36 insertions(+), 25 deletions(-)

New commits:
commit bc584fc5d8b06034f7acf229035483daf78a186e
Author: Luboš Luňák 
Date:   Tue May 14 19:46:43 2013 +0200

detect whether a bezier shape is open or closed

For open shapes e.g. fill does not work. Part of bnc#780044.

Change-Id: Id0ce50e94ae86c0398f06b2a67e3fd13d487ae7a

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 0af325d..2aa3bac 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -692,8 +692,8 @@ BezierShape::BezierShape(Drawing& rDrawing)
 
 Reference< XShape > BezierShape::implConvertAndInsert( const Reference< 
XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const
 {
-Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, 
rShapeRect );
 awt::Rectangle aCoordSys = getCoordSystem();
+PolyPolygonBezierCoords aBezierCoords;
 
 if( (aCoordSys.Width > 0) && (aCoordSys.Height > 0) )
 {
@@ -747,7 +747,6 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 }
 }
 
-PolyPolygonBezierCoords aBezierCoords;
 aBezierCoords.Coordinates.realloc( aCoordLists.size() );
 for ( unsigned int i = 0; i < aCoordLists.size(); i++ )
 aBezierCoords.Coordinates[i] = ContainerHelper::vectorToSequence( 
aCoordLists[i] );
@@ -756,6 +755,18 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 for ( unsigned int i = 0; i < aFlagLists.size(); i++ )
 aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( 
aFlagLists[i] );
 
+if( aCoordLists.front().front().X == aCoordLists.back().back().X
+&& aCoordLists.front().front().Y == aCoordLists.back().back().Y )
+{ // HACK: If the shape is in fact closed, which can be found out only 
when the path is known,
+  // force to closed bezier shape (otherwise e.g. fill won't work).
+const_cast< BezierShape* >( this )->setService( 
"com.sun.star.drawing.ClosedBezierShape" );
+}
+}
+
+Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, 
rShapeRect );
+
+if( aBezierCoords.Coordinates.hasElements())
+{
 PropertySet aPropSet( xShape );
 aPropSet.setProperty( PROP_PolyPolygonBezier, aBezierCoords );
 }
commit c2703b63fa8d16ce8efaa55e0431ae829fdd23c1
Author: Luboš Luňák 
Date:   Thu May 9 17:30:54 2013 +0200

remove non-sensical /*static*/ comments

They are presumably meant to say the functions are class-static,
but at the function definition it's pretty confusing (looks like 
file-static).

Change-Id: I28c69244c9eb7aa3f20f07d8784f3704dc6a57bf

diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 04ef753..f4d6b16 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -108,7 +108,7 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, 
sal_Int32 nBufferSize )
 
 // 
 
-/*static*/ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& 
rAttribs, sal_Int32 nElement )
+sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, 
sal_Int32 nElement )
 {
 sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 );
 OSL_ENSURE( (0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16), 
"CodecHelper::getPasswordHash - invalid password hash" );
diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index c2eabfe..29cc07b 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1132,7 +1132,7 @@ void ObjectFormatter::convertAutomaticFill( PropertySet& 
rPropSet, ObjectType eO
 pFormat->convertAutomaticFill( rPropSet, nSeriesIdx );
 }
 
-/*static*/ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& 
rxShapeProp )
+bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp )
 {
 return !rxShapeProp || !rxShapeProp->getFillProperties().moF

[Libreoffice-commits] core.git: include/svl svl/AllLangResTarget_svl.mk svl/source

[Andras Timar]

 include/svl/svl.hrc   |2 --
 svl/AllLangResTarget_svl.mk   |1 -
 svl/source/items/cstitem.src  |   26 --
 svl/source/items/dateitem.cxx |1 -
 4 files changed, 30 deletions(-)

New commits:
commit a69f31a322a8ff26814db194551c719ea140b027
Author: Andras Timar 
Date:   Tue May 14 18:48:36 2013 +0200

unused svl/source/items/cstitem.src + hrc cleanup

Change-Id: I3db54045dc5be13dd7c72076c96a7e3f3b7b30ea

diff --git a/include/svl/svl.hrc b/include/svl/svl.hrc
index 407fd67..0abe18b 100644
--- a/include/svl/svl.hrc
+++ b/include/svl/svl.hrc
@@ -105,8 +105,6 @@
 
 #define STR_SVT_MIMETYPE_END(STR_SVT_MIMETYPE_AUDIO_WEBM)
 
-#define STR_COLUM_DT_AUTO   (STR_SVT_MIMETYPE_END+1)
-
 #endif  // #ifndef _SVTOOLS_HRC
 
 // *** EOF
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index edb9041..30baf34 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
 svl/source/misc/mediatyp.src \
-svl/source/items/cstitem.src \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
deleted file mode 100644
index 24adf87..000
--- a/svl/source/items/cstitem.src
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-String STR_COLUM_DT_AUTO
-{
-Text [ en-US ] = "automatic" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 706d373..54e942e 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lingucomponent/source

[Tor Lillqvist]

 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d49a0b43048de8a9e5c154e405eb6cecaf606783
Author: Tor Lillqvist 
Date:   Tue May 14 20:24:55 2013 +0300

One more XPropertySet -> XLinguProperties

Change-Id: I9ce34899181416f6c5e38289035af35ed5533616

diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 0936661..9af04b2 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -466,7 +466,7 @@ void SAL_CALL
 sal_Int32 nLen = rArguments.getLength();
 if (2 == nLen)
 {
-Reference< XPropertySet >   xPropSet;
+Reference< XLinguProperties >   xPropSet;
 rArguments.getConstArray()[0] >>= xPropSet;
 //rArguments.getConstArray()[1] >>= xDicList;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/gengal'

[Michael Meeks]

New branch 'feature/gengal' available with the following commits:
commit e271da03a787fbe28121674869cbeb3bbe761e20
Author: Michael Meeks 
Date:   Tue May 14 17:01:32 2013 +0100

gallery: help on how to build new ones ...

Change-Id: Ia9f0e7196ce858e664e9a735ab55c34c5937bd1a

commit e94bc240314fca4092445bc0a1896624da977d83
Author: Michael Meeks 
Date:   Tue May 14 14:49:47 2013 +0100

gallery: fix a number of naming thinkos.

Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085

commit 3ef9437c6d9d0c3978cebbbd13f3e47edc3bb123
Author: Michael Meeks 
Date:   Tue May 14 13:03:31 2013 +0100

migrate galleries to new, cleaner build infrastructure.

Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d

commit 63fae6e6c706f1826221dd43516a8af76f283c56
Author: Michael Meeks 
Date:   Tue May 14 12:20:19 2013 +0100

linkoo - link instset into install

Change-Id: I9f1c340562030bccbe0627ba9e91a56e1611b64e

commit a9281454fb77a89e76e3441b1abec30bf2e97982
Author: Michael Meeks 
Date:   Mon May 13 22:33:03 2013 +0100

gallery: cleanup scaling code.

Change-Id: I783b0fe54c6273ce3d78996a02da02dc51944606

commit 15a2e057a7aa405c8c0263efcd25dea8633087b1
Author: Michael Meeks 
Date:   Mon May 13 21:20:00 2013 +0100

remove pre-compiled textshapes and transportation galleries.

Further gnumake fixups, package the files in the Gallery rules.

Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8

commit 2f5643c2707a0633b8cc36b0edd1118b9e72cbc9
Author: Michael Meeks 
Date:   Mon May 13 18:05:06 2013 +0100

migrate transportation gallery.

Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a

commit 2c379e15a99225a966871fb7f42301dca5f69d44
Author: Michael Meeks 
Date:   Mon May 13 17:56:35 2013 +0100

gallery: get windows gengal command-name right.

Change-Id: I488c57cfa58510e50b9b6819d55b23283aaddf49

commit a28179f45b580a0be553a82041d105a72f0fe911
Author: Michael Meeks 
Date:   Mon May 13 17:52:18 2013 +0100

gallery: convert text-shapes to new build logic.

Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b

commit d93dd1c2d690791f1b5ebe418f2d9f454d652a33
Author: Michael Meeks 
Date:   Mon May 13 17:16:56 2013 +0100

gallery: use icerun for building, and tweak for windows use.

Change-Id: Ic9e30661f05506b3616eaf417f8e3deed7290830

commit c58f39c0c266bfd55603ce97da67a579d2187eac
Author: Michael Meeks 
Date:   Mon May 13 16:26:40 2013 +0100

gallery: don't build galleries unless in the desktop profile.

Change-Id: I03fbfb173958c4d9e1e917f0d098ea8930d6041d

commit 12f1f72ae515377fab1043bad34068f69bf43dc2
Author: Michael Meeks 
Date:   Mon May 13 13:53:05 2013 +0100

gallery: cleanup makefiles for new gallery naming and translation.

Change-Id: I9ec5192c007df6d0ce15f5e61cb53cf6ea04db08

commit f4732825d2da56b867374b6d6b5fec52c3cb8082
Author: Michael Meeks 
Date:   Mon May 13 13:01:41 2013 +0100

gallery: allow comments in .str files.

Change-Id: I150dee5d9c3b8f2dc656c292d7e9ef56f05cff84

commit f2b8f1cef0fe848af389715207aadbd24de677f3
Author: Michael Meeks 
Date:   Mon May 13 12:34:01 2013 +0100

gallery: add auxiliary .desktop style translation files.

Change-Id: I2f2f0d5d30fbcab83343f94fd16d9371baa380e5

commit 55901ceceff5101915b13dc3c5d115706f506b08
Author: Michael Meeks 
Date:   Mon May 13 11:07:47 2013 +0100

gallery: remove obsolete GalleryImportThemeEntry

Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611

commit ece287a832f854c091f331f05ce14e3bf5d8627e
Author: Michael Meeks 
Date:   Mon May 13 10:35:51 2013 +0100

move desktop translation tool to solenv.

Change-Id: I6e119f79a9293fa204904459c75ff97e5d3b5be6

commit 79e0ed8b9e51e64c7138d1950a4272315bfcb376
Author: Michael Meeks 
Date:   Sat May 11 10:40:33 2013 +0100

gengal: theme creation fix.

Change-Id: I72544e2bea45cf3f83e944aee9ca95676f1879c1

commit 95bc24699af4caf6bf09d6bfc2330e578ccdd80c
Author: Michael Meeks 
Date:   Fri May 10 21:03:13 2013 +0100

gallery: fix hideous theme numbering / naming situation.

Change-Id: Ibe288e5b2e782da4dd5804a7e018d8ae85c156cc

commit 33b9eef272a5bd1f2b9f8183c048853d27dd3fd9
Author: Michael Meeks 
Date:   Wed May 8 17:10:02 2013 +0100

galleries: implement first self-built sound gallery

Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15

commit 90fa9ff1f5f6f331ff2df61c3d227d263e63c628
Author: Michael Meeks 
Date:   Wed May 8 17:08:55 2013 +0100

gengal: impl. relative URL pieces for internal galleries.

Change-Id: Ia44ad61e549e45ee2f4b8425023ed3e014fe2035

commit aedce5cd552f9d4cd257985fb6e88c70f6f4da45
Author: David Tardon 
Date:   Tue May 7 20:41:41 2013 +0200

gbuild: make Gallery work

Change-Id: Ia2914e24f03cdb3f24df30bf203a09d18f4a8fd4

commit e79f65dd7ddfa82ec20438434b410b7c0fa63c56
Author: David Tardon 
Date:   Tue May 7 19:35:56 2013 +0200

add license header

[Libreoffice-commits] core.git: 2 commits - chart2/Module_chart2.mk desktop/source fpicker/source include/svl include/svtools sfx2/source svl/Library_svl.mk svl/source svtools/inc svtools/source

[Stephan Bergmann]

 chart2/Module_chart2.mk  |1 
 desktop/source/app/app.cxx   |   13 -
 fpicker/source/office/iodlg.cxx  |   25 ---
 fpicker/source/office/iodlg.hxx  |   17 --
 fpicker/source/office/iodlgimp.cxx   |   32 +---
 include/svl/folderrestriction.hxx|   47 --
 include/svl/restrictedpaths.hxx  |   75 -
 include/svl/urlfilter.hxx|   12 -
 include/svtools/fileview.hxx |3 
 include/svtools/inettbc.hxx  |2 
 sfx2/source/inet/inettbc.cxx |1 
 svl/Library_svl.mk   |2 
 svl/source/misc/folderrestriction.cxx|   98 
 svl/source/misc/restrictedpaths.cxx  |  204 ---
 svtools/inc/pch/precompiled_svt.hxx  |1 
 svtools/source/contnr/contentenumeration.cxx |   11 -
 svtools/source/contnr/contentenumeration.hxx |4 
 svtools/source/contnr/fileview.cxx   |   12 -
 svtools/source/contnr/templwin.cxx   |   10 -
 svtools/source/contnr/templwin.hxx   |3 
 svtools/source/control/inettbc.cxx   |   17 --
 21 files changed, 21 insertions(+), 569 deletions(-)

New commits:
commit f3515761c00c6e911e9d4f2b10e941481c7ac720
Author: Stephan Bergmann 
Date:   Tue May 14 19:10:51 2013 +0200

Assume CppunitTest_chart2_import got removed by accident

...by 14c2ab30201d97f733375b4e3e88e5919701be25 "add export test for charts."

Change-Id: I5c77276a80e15fff8d4042c3bc52f3094227d647

diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 1cfe2ad..03c7cf3 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
 
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
 CppunitTest_chart2_export \
+CppunitTest_chart2_import \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
commit 03535b91605ae0cfdf3be5eb2dfdf5de5374bdb2
Author: Stephan Bergmann 
Date:   Tue May 14 19:07:34 2013 +0200

Remove obsolete RestrictedPath env var support

Change-Id: Ia4ea7d60d7b69c863c1e891887060265e73e1cb6

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2f0ecf6..e9437fe 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -85,7 +85,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1517,18 +1516,6 @@ int Desktop::Main()
 SetSplashScreenProgress(40);
 RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and 
SvtLanguageOptions" );
 
-// Check special env variable
-std::vector< String > aUnrestrictedFolders;
-svt::getUnrestrictedFolders( aUnrestrictedFolders );
-
-if ( !aUnrestrictedFolders.empty() )
-{
-// Set different working directory. The first entry is
-// the new work path.
-String aWorkPath = aUnrestrictedFolders[0];
-SvtPathOptions().SetWorkPath( aWorkPath );
-}
-
 xDesktop = css::frame::Desktop::create( xContext );
 
 // create service for loadin SFX (still needed in startup)
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6787f8d..1ed7a8c 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -508,7 +508,6 @@ void SvtFileDialog::Init_Impl
 _pImp->_pFtFileName = new FixedText( this, SvtResId( 
FT_EXPLORERFILE_FILENAME ) );
 
 SvtURLBox* pURLBox = new SvtURLBox( this, SvtResId( 
ED_EXPLORERFILE_FILENAME ) );
-pURLBox->SetUrlFilter( &m_aURLFilter );
 _pImp->_pEdFileName = pURLBox;
 _pImp->_pEdFileName->Show();
 pURLBox->SetSelectHdl( LINK( this, SvtFileDialog, EntrySelectHdl_Impl ) );
@@ -545,7 +544,6 @@ void SvtFileDialog::Init_Impl
 }
 
 _pImp->_pEdCurrentPath = new SvtURLBox( this, 
SvtResId(ED_EXPLORERFILE_CURRENTPATH) );
-_pImp->_pEdCurrentPath->SetUrlFilter( &m_aURLFilter );
 _pImp->_pEdCurrentPath->Show();
 
 _pImp->_pBtnFileOpen = new PushButton( this, SvtResId( 
BTN_EXPLORERFILE_OPEN ) );
@@ -568,7 +566,6 @@ void SvtFileDialog::Init_Impl
 _pFileView = new SvtFileView( this, SvtResId( CTL_EXPLORERFILE_FILELIST ),
FILEDLG_TYPE_PATHDLG == 
_pImp->_eDlgType,
_pImp->_bMultiSelection );
-_pFileView->SetUrlFilter( &m_aURLFilter );
 _pFileView->EnableAutoResize();
 
 _pFileView->SetHelpId( HID_FILEDLG_STANDARD );
@@ -1141,12 +1138,6 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, 
pVoid )
 {
 if ( aFileName != pThis->_pFileView->GetViewURL() )
 {
-if ( !pThis->m_aURLFilter.isUrlAllowed( aFileName ) )
-{
-pThis->simulateAccessDenied( aFileName );
-return 0;
-}
-
   

[Libreoffice-commits] core.git: Branch 'feature/gengal' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Luboš Luňák]

 solenv/gbuild/platform/filter-showIncludes.awk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09c20b2f623e2271a3ab9eb82c2419a8951320c1
Author: Luboš Luňák 
Date:   Tue May 14 18:24:35 2013 +0200

fix filter-showIncludes

We want what is after the prefix, not the prefix itself.
80cf1c22b629d524de18f20dcfd155d889ee5d2f could not have possibly worked.

Change-Id: Ic2ab84d8c60ac608a773368b873ea5f98be4cd29

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 5d3fdcb..331be66 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -42,7 +42,7 @@ BEGIN {
 {
 sub(/^ */, "")
 if (index($0, showincludes_prefix) == 1) {
-$0 = substr($0, 1, length(showincludes_prefix))
+$0 = substr($0, length(showincludes_prefix) + 1)
 sub(/^ */, "")
 gsub(/\\/, "/")
 gsub(/ /, "\\ ")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/aqua

[Tor Lillqvist]

 vcl/aqua/source/app/salinst.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 25aa3491bc92a9dfa018bf37df4639a1d0df5302
Author: Tor Lillqvist 
Date:   Tue May 14 19:10:54 2013 +0300

Fix return type of SalYieldMutex::tryToAcquire() to match declaration

Change-Id: I3a659b736bede41dd4790e8ec062c81ac3fa03e5

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index b97bbd5..4ccfc97 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -322,16 +322,16 @@ void SalYieldMutex::release()
 SolarMutexObject::release();
 }
 
-sal_Bool SalYieldMutex::tryToAcquire()
+bool SalYieldMutex::tryToAcquire()
 {
 if ( SolarMutexObject::tryToAcquire() )
 {
 mnThreadId = osl::Thread::getCurrentIdentifier();
 mnCount++;
-return sal_True;
+return true;
 }
 else
-return sal_False;
+return false;
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [LibreOffice-QA] Public Conference Call May 17, 2013 - 1300 UTC

[Mas]

On Tue, May 14, 2013 at 11:33 AM, Joel Madero  wrote:

> Hi All,
>
> Just a reminder that this Friday is our bi-weekly public call, anyone is
> welcome to join:
>
> https://wiki.documentfoundation.org/QA/Meetings/2013/May_17
>
> If you don't want to join often times there is some discussion happening
> on IRC at the same time at #libreoffice-qa on Freenode.
>
>
> Best Regards,
> Joel
>
> --
> *Joel Madero*
> LibreOffice QA Volunteer
> jmadero@gmail.com
>
>
> -



I will be joining the call ,


-- 
--
Mas Walls
Web Security Analyst | Senior Server Administrator
Powserve.com / Gemini ISP Networks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Asking about math issue

[Marcos Souza]

Hi guys!

I was looking at this old issue in math. I can reproduce this behavior, and
it maybe be simple to fix:
https://bugs.freedesktop.org/show_bug.cgi?id=32062

So, my idea:
If we have the formula selected, and we insert a new unary operator
operator(+- , -+, ¬, +, -) we will prepend the current formula with the new
unary operator.

Else If we don't have anything selected, just add the unary operator.

Else // if we have text selected
replace the formula with the new operator

What you guys think?

If you agree, I'll ask for code pointers to make this works :)

Thanks since now!

-- 
Att,

Marcos Paulo de Souza
Acadêmico de Ciencia da Computação - FURB - SC
Github: https://github.com/marcosps/
"Uma vida sem desafios é uma vida sem razão"
"A life without challenges, is a non reason life"
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/d66eeb883676c095c8360ef609e56b9bc055a3

[Caolán McNamara]

 8f/d66eeb883676c095c8360ef609e56b9bc055a3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9be2d670b59bfb2cd210af1a42baeba90c6c807
Author: Caolán McNamara 
Date:   Tue May 14 16:42:40 2013 +0100

Notes added by 'git notes add'

diff --git a/8f/d66eeb883676c095c8360ef609e56b9bc055a3 
b/8f/d66eeb883676c095c8360ef609e56b9bc055a3
new file mode 100644
index 000..74f6637
--- /dev/null
+++ b/8f/d66eeb883676c095c8360ef609e56b9bc055a3
@@ -0,0 +1 @@
+merged as: 9ddf14e46b0129e828e01cbf279eb46a9a583fd6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/source

[Ariel Constenla-Haile]

 sdext/source/minimizer/informationdialog.cxx |   52 +++
 sdext/source/minimizer/informationdialog.hxx |1 
 2 files changed, 14 insertions(+), 39 deletions(-)

New commits:
commit 9ddf14e46b0129e828e01cbf279eb46a9a583fd6
Author: Ariel Constenla-Haile 
Date:   Wed Mar 6 12:45:15 2013 +

Resolves: #i82852# Presentation Minimizer: missing icon in info dialog

(cherry picked from commit 8fd66eeb883676c095c8360ef609e56b9bc055a3)

Conflicts:
sdext/source/minimizer/informationdialog.cxx
sdext/source/minimizer/informationdialog.hxx

Change-Id: I8f6ea8edf7c1b95fefa6c280a92030d628339e56

diff --git a/sdext/source/minimizer/informationdialog.cxx 
b/sdext/source/minimizer/informationdialog.cxx
index 92accb2..babba10 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -90,8 +90,15 @@ OUString InsertFixedText( InformationDialog& 
rInformationDialog, const OUString&
 return rControlName;
 }
 
-OUString InsertImage( InformationDialog& rInformationDialog, const OUString& 
rControlName, const OUString& rURL,
-sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, 
sal_Int32 nHeight )
+OUString InsertImage(
+InformationDialog& rInformationDialog,
+const OUString& rControlName,
+const OUString& rURL,
+sal_Int32 nPosX,
+sal_Int32 nPosY,
+sal_Int32 nWidth,
+sal_Int32 nHeight,
+sal_Bool bScale )
 {
 OUString pNames[] = {
 TKGet( TK_Border ),
@@ -108,7 +115,7 @@ OUString InsertImage( InformationDialog& 
rInformationDialog, const OUString& rCo
 Any( rURL ),
 Any( nPosX ),
 Any( nPosY ),
-Any( sal_True ),
+Any( bScale ),
 Any( nWidth ) };
 sal_Int32 nCount = SAL_N_ELEMENTS( pNames );
 
@@ -202,40 +209,6 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal )
 return aVal.makeStringAndClear();
 }
 
-OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
-{
-OUString sURL;
-try
-{
-mxTempFile = Reference< XStream >( io::TempFile::create(mxMSF), 
UNO_QUERY_THROW );
-Reference< XPropertySet > xPropSet( mxTempFile, UNO_QUERY );
-Reference< XOutputStream > xOutputStream( 
mxTempFile->getOutputStream() );
-if ( xOutputStream.is() && xPropSet.is() )
-{
-Reference< graphic::XGraphicProvider > xGraphicProvider( 
graphic::GraphicProvider::create( mxMSF ) );
-Sequence< PropertyValue > aArgs( 1 );
-aArgs[ 0 ].Name = OUString("URL");
-aArgs[ 0 ].Value <<= sPrivateURL;
-Reference< graphic::XGraphic > xGraphic( 
xGraphicProvider->queryGraphic( aArgs ) );
-if ( xGraphic.is() )
-{
-OUString aDestMimeType( "image/png"  );
-Sequence< PropertyValue > aArgs2( 2 );
-aArgs2[ 0 ].Name = TKGet( TK_MimeType );// the 
GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
-aArgs2[ 0 ].Value <<= aDestMimeType;
-aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
-aArgs2[ 1 ].Value <<= xOutputStream;
-xGraphicProvider->storeGraphic( xGraphic, aArgs2 );
-}
-xPropSet->getPropertyValue( OUString("Uri") ) >>= sURL;
-}
-}
-catch( Exception& )
-{
-}
-return sURL;
-}
-
 void InformationDialog::InitDialog()
 {
 sal_Int32 nDialogHeight = DIALOG_HEIGHT;
@@ -325,7 +298,10 @@ void InformationDialog::InitDialog()
 aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), 
aTitle );
 
 com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > 
xItemListener;
-InsertImage( *this, OUString("aboutimage"), ImpGetStandardImage( 
OUString("private:standardimage/query") ), 5, 5, 25, 25 );
+InsertImage( *this,
+ OUString( "aboutimage" ),
+ OUString( "private:standardimage/query" ),
+ 5, 5, 25, 25, sal_False );
 InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, 
PAGE_WIDTH, 24, sal_True, 0 );
 if ( !maSaveAsURL.isEmpty() )
 InsertCheckBox(  *this, TKGet( TK_OpenNewDocument ), xItemListener, 
getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
diff --git a/sdext/source/minimizer/informationdialog.hxx 
b/sdext/source/minimizer/informationdialog.hxx
index 8486de3..5de67e1 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -61,7 +61,6 @@ private :
 
 com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >  
mxActionListener;
 
-OUString ImpGetStandardImage( const OUString& rPrivateURL );
 void InitDialog();
 
 sal_Int64 mnSourceSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.f

[LibreOffice-QA] Public Conference Call May 17, 2013 - 1300 UTC

[Joel Madero]

Hi All,

Just a reminder that this Friday is our bi-weekly public call, anyone is
welcome to join:

https://wiki.documentfoundation.org/QA/Meetings/2013/May_17

If you don't want to join often times there is some discussion happening on
IRC at the same time at #libreoffice-qa on Freenode.


Best Regards,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ABANDONED] oleobject.ui widget

[via Code Review]

Caolán McNamara has abandoned this change.

Change subject: oleobject.ui widget
..


Patch Set 1: Abandoned

sorry, this one is already converted

-- 
To view, visit https://gerrit.libreoffice.org/3795
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I716cfd924c20fba026c88a90344fd0af2d91e959
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae 
Gerrit-Reviewer: Caolán McNamara 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/shared/01/0207.xhp |   15 +--
 2 files changed, 5 insertions(+), 17 deletions(-)

New commits:
commit e0c44f8ece1d3732eeec93b0177b9c1ab1bc37f7
Author: Caolán McNamara 
Date:   Tue May 14 16:19:47 2013 +0100

update helpids for paste special .ui conversion

Change-Id: I7d862afde503342c57c3cf06f4665e7722868eb8

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 960fc5b..b8e60ae 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2742,7 +2742,6 @@ HID_PAGE_TEXTATTR,33854,
 HID_PASSWD_DOC,58994,
 HID_PASSWD_TABLE,58993,
 HID_PASSWORD,33824,
-HID_PASTE_DLG,34868,
 HID_POPUP_COLOR,33838,
 HID_POPUP_COLOR_CTRL,34186,
 HID_POPUP_FRAME,33840,
@@ -7210,7 +7209,6 @@ svx_CB_USE_VARIANTS_DLG_CHINESETRANSLATION,1078657024,
 svx_CheckBox_DLG_CHINESETRANSLATION_CB_TRANSLATE_COMMONTERMS,1078658050,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT,1598211094,
 svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINWIDTHDEFAULT,1598211093,
-svx_CheckBox_MD_PASTE_OBJECT_CB_DISPLAY_AS_ICON,1598047244,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT,81059,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC,81057,
@@ -7505,7 +7503,6 @@ 
svx_ImageButton_RID_SVXPAGE_TEXTANIMATION_BTN_UP,703737345,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_HORZ,1238295050,
 svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052,
 svx_ListBox_DLG_CHINESEDICTIONARY_LB_PROPERTY,1078676993,
-svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST,1598049799,
 svx_ListBox_OFA_TP_LANGUAGES_LB_ASIAN_LANG,810569224,
 svx_ListBox_OFA_TP_LANGUAGES_LB_COMPLEX_LANG,810569226,
 svx_ListBox_OFA_TP_LANGUAGES_LB_CURRENCY,810569235,
@@ -7766,7 +7763,6 @@ svx_ModalDialog_MD_ICONCHANGE,1080606720,
 svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280,
 svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048,
 svx_ModalDialog_MD_LINKEDIT,1598095360,
-svx_ModalDialog_MD_PASTE_OBJECT,1598046208,
 svx_ModalDialog_MD_UPDATE_BASELINKS,1598062592,
 svx_ModalDialog_RID_DEFAULTABOUT,1078001664,
 svx_ModalDialog_RID_DLG_NEWLIB,1242333184,
@@ -7833,7 +7829,6 @@ svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601,
 svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589,
 svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901,
 svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663,
-svx_PushButton_MD_PASTE_OBJECT_PB_CHANGE_ICON,1598050830,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_CHANGE_SOURCE,1598067237,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_OPEN_SOURCE,1598067236,
@@ -7971,8 +7966,6 @@ 
svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON,1598210578,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO,1598210575,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF,1598210574,
 svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON,1598210573,
-svx_RadioButton_MD_PASTE_OBJECT_RB_PASTE,1598046740,
-svx_RadioButton_MD_PASTE_OBJECT_RB_PASTE_LINK,1598046741,
 svx_RadioButton_MD_UPDATE_BASELINKS_RB_AUTOMATIC,1598063146,
 svx_RadioButton_MD_UPDATE_BASELINKS_RB_MANUAL,1598063147,
 svx_RadioButton_RID_OFA_TP_INTERNATIONAL_RB_TXTDIR_LEFT2RIGHT,811336194,
diff --git a/source/text/shared/01/0207.xhp 
b/source/text/shared/01/0207.xhp
index 58d2f3f..0715101 100644
--- a/source/text/shared/01/0207.xhp
+++ b/source/text/shared/01/0207.xhp
@@ -27,12 +27,9 @@
 
 
 
-
-
 
-
 
-
+
 Paste Special
 Inserts the contents of the clipboard into the current 
file in a format that you can specify.
 
@@ -64,17 +61,15 @@
 
 
 
-
+
 Source
-Displays the source of the clipboard 
contents.
-
-
+Displays the source of the 
clipboard contents.
+
 Selection
-Select a 
format for the clipboard contents that you want to paste.
+Select a format for the 
clipboard contents that you want to paste.
 When you 
paste HTML data into a text document, you can choose "HTML format" or "HTML 
format without comments". The second choice is the default; it pastes all HTML 
data, but no comments. 
 
 
-
 Paste Special 
 
 This dialog 
appears in Calc if the clipboard contains spreadsheet cells. 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit facb4d5741e8f8f093bd288b32c40f9168cd911a
Author: Caolán McNamara 
Date:   Tue May 14 16:19:47 2013 +0100

Updated core
Project: help  e0c44f8ece1d3732eeec93b0177b9c1ab1bc37f7

diff --git a/helpcontent2 b/helpcontent2
index 915ff02..e0c44f8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 915ff02c0ee683d1ccbc1b3f5a9f53baa5646f8a
+Subproject commit e0c44f8ece1d3732eeec93b0177b9c1ab1bc37f7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ba/12679129efc39834114be8bca835d8a84aacb6

[Caolán McNamara]

 ba/12679129efc39834114be8bca835d8a84aacb6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 57e2318aad53584498ac34d880579abdc11aa938
Author: Caolán McNamara 
Date:   Tue May 14 16:15:20 2013 +0100

Notes added by 'git notes add'

diff --git a/ba/12679129efc39834114be8bca835d8a84aacb6 
b/ba/12679129efc39834114be8bca835d8a84aacb6
new file mode 100644
index 000..e28e2b0
--- /dev/null
+++ b/ba/12679129efc39834114be8bca835d8a84aacb6
@@ -0,0 +1 @@
+merged as: 4d8301935d5ccb39e0853d447a02511c0bb76f28
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk i18npool/source sd/uiconfig

[Ariel Constenla-Haile]

 cui/UIConfig_cui.mk   |1 
 cui/source/dialogs/pastedlg.cxx   |   56 +
 cui/source/dialogs/svuidlg.hrc|   14 --
 cui/source/dialogs/svuidlg.src|   88 --
 cui/source/inc/helpid.hrc |1 
 cui/source/inc/pastedlg.hxx   |   25 
 cui/uiconfig/ui/pastespecial.ui   |  184 ++
 i18npool/source/localedata/data/gl_ES.xml |   38 +++---
 sd/uiconfig/sdraw/ui/pastespecial.ui  |  181 -
 9 files changed, 221 insertions(+), 367 deletions(-)

New commits:
commit 4d8301935d5ccb39e0853d447a02511c0bb76f28
Author: Ariel Constenla-Haile 
Date:   Tue May 14 00:23:03 2013 +

Resolves: #i122306# Remove dot from abbreviate day and month names in 
Galician

(cherry picked from commit ba12679129efc39834114be8bca835d8a84aacb6)

Change-Id: Ifa216baec3e89578215e868c63a1add446005f4b
Signed-off-by: Caolán McNamara 

diff --git a/i18npool/source/localedata/data/gl_ES.xml 
b/i18npool/source/localedata/data/gl_ES.xml
index 01fe4bd..4b02e59 100644
--- a/i18npool/source/localedata/data/gl_ES.xml
+++ b/i18npool/source/localedata/data/gl_ES.xml
@@ -201,99 +201,99 @@
   
 
   sun
-  dom.
+  dom
   domingo
 
 
   mon
-  lun.
+  lun
   luns
 
 
   tue
-  mar.
+  mar
   martes
 
 
   wed
-  mér.
+  mér
   mércores
 
 
   thu
-  xov.
+  xov
   xoves
 
 
   fri
-  ven.
+  ven
   venres
 
 
   sat
-  sáb.
+  sáb
   sábado
 
   
   
 
   jan
-  xan.
+  xan
   xaneiro
 
 
   feb
-  feb.
+  feb
   febreiro
 
 
   mar
-  mar.
+  mar
   marzo
 
 
   apr
-  abr.
+  abr
   abril
 
 
   may
-  mai.
+  mai
   maio
 
 
   jun
-  xuñ.
+  xuñ
   xuño
 
 
   jul
-  xul.
+  xul
   xullo
 
 
   aug
-  ago.
+  ago
   agosto
 
 
   sep
-  set.
+  set
   setembro
 
 
   oct
-  out.
+  out
   outubro
 
 
   nov
-  nov.
+  nov
   novembro
 
 
   dec
-  dec.
+  dec
   decembro
 
   
commit 467dc11fbabb5579b4f05fce61d94720a0988df6
Author: Caolán McNamara 
Date:   Tue May 14 14:05:38 2013 +0100

adapt code to use paste special .ui

Change-Id: Iaac28f442aa38dd6610c89ba04ea2d1ccfca35c5

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 327223f..25fbc0c 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optuserpage \
cui/uiconfig/ui/optviewpage \
cui/uiconfig/ui/pageformatpage \
+   cui/uiconfig/ui/pastespecial \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index fd18c1b..795dae4 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include "svuidlg.hrc"
 #include 
 #include 
 #include 
@@ -37,37 +36,26 @@
 #include 
 
 SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
-
-: ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
-aFtSource( this, CUI_RES( FT_SOURCE ) ),
-aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
-aFlChoice( this, CUI_RES( FL_CHOICE ) ),
-aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
-aOKButton1( this, CUI_RES( 1 ) ),
-aCancelButton1( this, CUI_RES( 1 ) ),
-aHelpButton1( this, CUI_RES( 1 ) )
+: ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
 {
-FreeResource();
-SetHelpId( HID_PASTE_DLG );
-SetUniqueId( HID_PASTE_DLG );
+get(m_pFtObjectSource, "source");
+get(m_pLbInsertList, "list");
+get(m_pOKButton, "ok");
 
-Font aFont = aFtObjectSource.GetFont();
-aFont.SetWeight( WEIGHT_LIGHT );
-aFtObjectSource.SetFont( aFont );
-aOKButton1.Disable();
+m_pLbInsertList->SetDropDownLineCount(8);
+
m_pLbInsertList->set_width_request(m_pLbInsertList->approximate_char_width() * 
32);
+m_pOKButton->Disable();
 
 ObjectLB().SetSelectHdl( LINK( this,

[PUSHED] remove empty string (fixes a warning)

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3909

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3909
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar 
Gerrit-Reviewer: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sysui/desktop

[Andras Timar]

 sysui/desktop/share/launcher_unityquicklist.ulf |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 1f32864fa719773e1ad074ba2b27947917b76c0c
Author: Andras Timar 
Date:   Tue May 14 15:24:15 2013 +0200

remove empty string (fixes a warning)

Ulfex warning: inavlid po attributes extracted from 
/home/timar/libreoffice-master/sysui/desktop/share/launcher_unityquicklist.ulf
No string specified!
GroupID: startcenter

Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a
Reviewed-on: https://gerrit.libreoffice.org/3909
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf 
b/sysui/desktop/share/launcher_unityquicklist.ulf
index 0f489bb..c41a645 100644
--- a/sysui/desktop/share/launcher_unityquicklist.ulf
+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
@@ -15,6 +15,3 @@ en-US = "New Formula"
 
 [draw]
 en-US = "New Drawing"
-
-[startcenter]
-en-US = ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libmwaw/libmwaw-0.1.9.patch.1 libmwaw/UnpackedTarball_libmwaw.mk

[Fridrich Štrba]

 libmwaw/UnpackedTarball_libmwaw.mk |4 
 libmwaw/libmwaw-0.1.9.patch.1  |   15 +++
 2 files changed, 19 insertions(+)

New commits:
commit edab1a30fcb159347ee6034fefcfd0773aa5f335
Author: Fridrich Å trba 
Date:   Tue May 14 16:56:23 2013 +0200

trying to unbreak windows build

Change-Id: I3db28992dc3d3bbe63d8679d5a43bab11a66bdcd

diff --git a/libmwaw/UnpackedTarball_libmwaw.mk 
b/libmwaw/UnpackedTarball_libmwaw.mk
index 96fe9df..8e3be68 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+   libmwaw/libmwaw-0.1.9.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.9.patch.1 b/libmwaw/libmwaw-0.1.9.patch.1
new file mode 100644
index 000..e5eb6da
--- /dev/null
+++ b/libmwaw/libmwaw-0.1.9.patch.1
@@ -0,0 +1,15 @@
+--- a/src/lib/MWAWTable.hxx
 b/src/lib/MWAWTable.hxx
+@@ -117,7 +117,11 @@ protected:
+   - c2.m_cell->box().size()[m_coord];
+   if (diffF < 0) return true;
+   if (diffF > 0) return false;
+-  return ssize_t(c1.m_cell) < ssize_t(c2.m_cell);
++#ifdef _WIN64
++  return __int64(c1.m_cell) < __int64(c2.m_cell);
++#else
++  return long(c1.m_cell) < long(c2.m_cell);
++#endif
+ }
+ 
+ //! the coord to compare
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 vcl/qa/cppunit/graphicfilter/filters-test.cxx |   20 
 vcl/source/gdi/bitmap3.cxx|   19 ++-
 2 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 1d4bbe7b305558faf86aa083cc50d71a7804ef7d
Author: Michael Meeks 
Date:   Mon May 13 22:32:32 2013 +0100

vcl: attempt to fix high quality scaling to get aspect ratio right.

Change-Id: Ic62c6a16c39dd4e4e19bf9a96503ecf6ac50f292

diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx 
b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 23f2978..7d73e2c 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -38,8 +38,12 @@ public:
  */
 void testCVEs();
 
+/// test scaling
+void testScaling();
+
 CPPUNIT_TEST_SUITE(VclFiltersTest);
 CPPUNIT_TEST(testCVEs);
+CPPUNIT_TEST(testScaling);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -53,6 +57,22 @@ bool VclFiltersTest::load(const OUString &,
 return aGraphicFilter.ImportGraphic(aGraphic, rURL, aFileStream) == 0;
 }
 
+void VclFiltersTest::testScaling()
+{
+for (unsigned int i = BMP_SCALE_FAST; i <= BMP_SCALE_BOX; i++)
+{
+Bitmap aBitmap( Size( 413, 409 ), 24 );
+BitmapEx aBitmapEx( aBitmap );
+
+fprintf( stderr, "scale with type %d\n", i );
+CPPUNIT_ASSERT( aBitmapEx.Scale( 0.1937046, 0.193154, i ) );
+Size aAfter( aBitmapEx.GetSizePixel() );
+fprintf( stderr, "size %ld, %ld\n", (long)aAfter.Width(),
+ aAfter.Height() );
+CPPUNIT_ASSERT( labs (aAfter.Height() - aAfter.Width()) <= 1 );
+}
+}
+
 void VclFiltersTest::testCVEs()
 {
 #ifndef DISABLE_CVE_TESTS
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index e639b36..5b56ae4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2368,7 +2368,7 @@ namespace
 }
 
 // #i121233# Added BMP_SCALE_LANCZOS, BMP_SCALE_BICUBIC, BMP_SCALE_BILINEAR and
-// BMP_SCALE_BOX derived from the original commit from Tomaž Vajngerl (see
+// BMP_SCALE_BOX derived from the original commit from Tomas Vajngerl (see
 // bugzilla task for deitails) Thanks!
 sal_Bool Bitmap::ImplScaleConvolution(
 const double& rScaleX,
@@ -2426,29 +2426,38 @@ sal_Bool Bitmap::ImplScaleConvolution(
 const sal_uInt32 nInBetweenSizeHorFirst(nHeight * nNewWidth);
 const sal_uInt32 nInBetweenSizeVerFirst(nNewHeight * nWidth);
 
+Bitmap aInterm;
 if(nInBetweenSizeHorFirst < nInBetweenSizeVerFirst)
 {
 if(bScaleHor)
 {
-bResult = ImplScaleConvolutionHor(*this, aResult, fScaleX, 
aKernel);
+bResult = ImplScaleConvolutionHor(*this, aInterm, fScaleX, 
aKernel);
 }
+else
+aInterm = *this;
 
 if(bResult && bScaleVer)
 {
-bResult = ImplScaleConvolutionVer(*this, aResult, fScaleY, 
aKernel);
+bResult = ImplScaleConvolutionVer(aInterm, aResult, fScaleY, 
aKernel);
 }
+else
+aResult = aInterm;
 }
 else
 {
 if(bScaleVer)
 {
-bResult = ImplScaleConvolutionVer(*this, aResult, fScaleY, 
aKernel);
+bResult = ImplScaleConvolutionVer(*this, aInterm, fScaleY, 
aKernel);
 }
+else
+aInterm = *this;
 
 if(bResult && bScaleHor)
 {
-bResult = ImplScaleConvolutionHor(*this, aResult, fScaleX, 
aKernel);
+bResult = ImplScaleConvolutionHor(aInterm, aResult, fScaleX, 
aKernel);
 }
+else
+aResult = aInterm;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - sd/CppunitTest_sd_import_tests.mk sd/CppunitTest_sd_regression_test.mk sd/Module_sd.mk sd/qa test/source

[Jan Holesovsky]

 dev/null |binary
 sd/CppunitTest_sd_import_tests.mk|  121 +++
 sd/CppunitTest_sd_regression_test.mk |  121 ---
 sd/Module_sd.mk  |2 
 sd/qa/unit/data/n758621.ppt  |binary
 sd/qa/unit/data/smoketest.pptx   |binary
 sd/qa/unit/data/xml/n758621_0.xml|   31 +++
 sd/qa/unit/data/xml/n758621_1.xml|   31 +++
 sd/qa/unit/filters-test.cxx  |  104 -
 sd/qa/unit/import-tests.cxx  |  159 
 sd/qa/unit/regression-test.cxx   |  273 ---
 sd/qa/unit/sdmodeltestbase.hxx   |  176 ++
 test/source/diff/diff.cxx|   46 -
 13 files changed, 553 insertions(+), 511 deletions(-)

New commits:
commit d97732f635c0583fbeea5706399ba9197903dc83
Author: Jan Holesovsky 
Date:   Tue May 14 16:39:14 2013 +0200

sd unittests: Fix the loading of .ppt tests, and introduce test for 
n#758621.

This also adds instructions how to easily add tests for which it is enough 
to
check the drawinglayer dump.

Change-Id: Ieaf261a9be0c8da2fa81c075dadebcac0c07def5

diff --git a/sd/qa/unit/data/n758621.ppt b/sd/qa/unit/data/n758621.ppt
new file mode 100755
index 000..1470efa
Binary files /dev/null and b/sd/qa/unit/data/n758621.ppt differ
diff --git a/sd/qa/unit/data/xml/n758621_0.xml 
b/sd/qa/unit/data/xml/n758621_0.xml
new file mode 100644
index 000..fe2e156
--- /dev/null
+++ b/sd/qa/unit/data/xml/n758621_0.xml
@@ -0,0 +1,31 @@
+
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
diff --git a/sd/qa/unit/data/xml/n758621_1.xml 
b/sd/qa/unit/data/xml/n758621_1.xml
new file mode 100644
index 000..a76af22
--- /dev/null
+++ b/sd/qa/unit/data/xml/n758621_1.xml
@@ -0,0 +1,31 @@
+
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index df3b1de..0c6d8a7 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -38,20 +38,32 @@ public:
 
 /** Test document against a reference XML dump of shapes.
 
-TODO: add info how to create the reference XML dump.
+If you want to update one of these tests, set the nUpdateMe to the index of
+the test, the dump XML's will be created (or rewritten) instead of checking.
+Use with care - when the test is failing, first find out why, instead of just
+updating .xml's blindly.
+
+NOTE: This approach is suitable only for tests of fixes that actually change
+the layout - best to check by reverting your fix locally after having added
+the test, and re-running; it should break.
 */
 void SdFiltersTest::testDocumentLayout()
 {
 struct { const char *pInput, *pDump; } aFilesToCompare[] =
 {
 { "odp/shapes-test.odp", "xml/shapes-test_page" },
-{ "pptx/fdo47434-all.pptx", "pptx/xml/fdo47434_page" }
+{ "pptx/fdo47434-all.pptx", "pptx/xml/fdo47434_page" },
+{ "n758621.ppt", "xml/n758621_" }
 };
 
-for ( unsigned int i = 0; i < SAL_N_ELEMENTS( aFilesToCompare ); ++i )
+for ( int i = 0; i < static_cast< int >( SAL_N_ELEMENTS( aFilesToCompare ) 
); ++i )
 {
+int nUpdateMe = -1; // index of test we want to update; supposedly 
only when the test is created
+
 ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc( 
"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ) 
);
-compareWithShapesDump( xDocShRef, getPathFromSrc( "/sd/qa/unit/data/" 
) + OUString::createFromAscii( aFilesToCompare[i].pDump ) );
+compareWithShapesDump( xDocShRef,
+getPathFromSrc( "/sd/qa/unit/data/" ) + 
OUString::createFromAscii( aFilesToCompare[i].pDump ),
+i == nUpdateMe );
 }
 }
 
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 9852338..853f089 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -29,7 +29,7 @@
 using namespace ::com::sun::star;
 
 struct FileFormat {
-const char* pName; const char* pFilterName; const char* pTypeName; 
sal_uLong nFormatType;
+const char* pName; const char* pFilterName; const char* pTypeName; const 
char* pUserData; sal_uLong nFormatType;
 };
 
 // These values are taken from "Flags" in 
filter/source/config/fragments/filters/*
@@ -46,10 +46,10 @@ pTypeName: ...
 nFormatType: ...
 */
 FileFormat aFileFormats[] = {
-{ "odp",  "impress8", "impress8", ODP_FORMAT_TYPE },
-{ "ppt",  "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", 
PPT_FORMAT_TYPE },
-{ "pptx", "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", 
PPTX_FORMAT_TYPE },
-{ 0, 0, 0, 0 }
+{ "odp",  "impress8", "impress8", "", ODP_FORMAT_TYPE },
+{ "ppt",  "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", 
"sdfilt", PPT_FORMAT_TYPE },
+   

[Libreoffice-commits] core.git: fpicker/source l10ntools/source sd/source svl/source xmloff/source

[Andras Timar]

 fpicker/source/win32/filepicker/controlcommand.cxx |4 ++--
 l10ntools/source/common.cxx|4 ++--
 sd/source/ui/table/TableDesignPane.cxx |2 +-
 svl/source/misc/filenotation.cxx   |2 +-
 xmloff/source/text/txtimppr.cxx|2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e347af862c2289b16f231c9085492e913861e347
Author: Andras Timar 
Date:   Tue May 14 15:51:42 2013 +0200

typo fix: s/inavlid/invalid/

Change-Id: If75cad038f35033be6dcad6f051673bd795accf3

diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx 
b/fpicker/source/win32/filepicker/controlcommand.cxx
index 3351847..222bb19 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -50,7 +50,7 @@ CControlCommandResult* SAL_CALL 
CControlCommand::handleRequest( CControlCommandR
 // redirect the request to the next element
 // so the base class implementation has to do it
 
-OSL_ENSURE( pRequest, "inavlid parameter" );
+OSL_ENSURE( pRequest, "invalid parameter" );
 
 CControlCommandResult* result;
 CControlCommand* nextCommand;
@@ -206,7 +206,7 @@ void SAL_CALL CLabelControlCommand::exec( CFilePickerState* 
aFilePickerState )
 
 CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( 
CControlCommandRequest* aRequest )
 {
-OSL_ENSURE( aRequest, "inavlid parameter" );
+OSL_ENSURE( aRequest, "invalid parameter" );
 
 CControlCommandResult* result;
 CControlCommand* nextCommand;
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index b143a7c..db86845 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -94,7 +94,7 @@ void writeUsage(const OString& rName, const OString& 
rFileType)
 << " FileIn:   Source files (" << rFileType.getStr() << ")\n"
 << " FileOut:  Destination file (*.*)\n"
 << " DataBase: Mergedata (*.po)\n"
-<< " Lang: Restrict the handled languag; one element of\n"
+<< " Lang: Restrict the handled language; one element of\n"
 << " (de, en-US, ...) or all\n";
 }
 
@@ -116,7 +116,7 @@ void writePoEntry(
 }
 else
 {
-std::cerr << rExecutable << " warning: inavlid po attributes 
extracted from " <<  rSourceFile << "\n";
+std::cerr << rExecutable << " warning: invalid po attributes 
extracted from " <<  rSourceFile << "\n";
 if(aException == PoEntry::NOGROUPID)
 {
 std::cerr << "No groupID specified!\n";
diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 8e44325..b026177 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -617,7 +617,7 @@ struct TableStyleSettings
 
 static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, 
CellInfoVector& rVector )
 {
-DBG_ASSERT( xTableStyle.is() && (xTableStyle->getCount() == 
sdr::table::style_count ), "sd::FillCellInfoVector(), inavlid table style!" );
+DBG_ASSERT( xTableStyle.is() && (xTableStyle->getCount() == 
sdr::table::style_count ), "sd::FillCellInfoVector(), invalid table style!" );
 if( xTableStyle.is() ) try
 {
 rVector.resize( sdr::table::style_count );
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index 1b7dee2..b7b4014 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -125,7 +125,7 @@ namespace svt
 case N_URL: return m_sFileURL;
 }
 
-OSL_FAIL("OFileNotation::get: inavlid enum value!");
+OSL_FAIL("OFileNotation::get: invalid enum value!");
 return OUString();
 }
 
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index a5f49f0..306ebb1 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -591,7 +591,7 @@ void XMLTextImportPropertyMapper::finished(
 }
 
 
-// insert newly created properties. This inavlidates all iterators!
+// insert newly created properties. This invalidates all iterators!
 // Most of the pXXX variables in this method are iterators and will be
 // invalidated!!!
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Android app will work on Toshiba AC100 laptop?

[Robinson Tryon]

On Tue, May 14, 2013 at 6:29 AM, Robert  wrote:
> Hello, I was wondering if the app will work on the Toshiba AC100 laptop
> which has no touchscreeen? Thanks!

Hi Robert,

This is the primary development list where we discuss changes to the
code of LibreOffice. For questions about LibreOffice in general, I
suggest that you try the Users' mailing list:
https://www.libreoffice.org/get-help/mailing-lists/

The port of LibreOffice to Android is still very much a work in
progress. For more information, please see the documentation on our
wiki:
https://wiki.documentfoundation.org/LibreOffice_on_Android

If you are a developer (or like to play one at home :-), then please
feel free to take a look at the Android-specific code and our
pre-alpha testing builds linked from that page. We know that there are
a lot of bugs and quirks in the current Android builds, so unless
you're prepared to fix them yourself, please don't file any bugs
against the Android builds for now.

Happy Hacking,
-- Robinson
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Jan Holesovsky  changed:

   What|Removed |Added

 Depends on||64586

--- Comment #17 from Jan Holesovsky  ---
Adding bug 64586 - cannot save any text to ppt.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 64/b59c444595b3c2ca72487e1cb15de6faa68985

[Caolán McNamara]

 64/b59c444595b3c2ca72487e1cb15de6faa68985 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7add52381f0da85a07d4d7b0df7b8e0cb7b7faac
Author: Caolán McNamara 
Date:   Tue May 14 15:30:08 2013 +0100

Notes added by 'git notes add'

diff --git a/64/b59c444595b3c2ca72487e1cb15de6faa68985 
b/64/b59c444595b3c2ca72487e1cb15de6faa68985
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/64/b59c444595b3c2ca72487e1cb15de6faa68985
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut key...

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3853

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3853
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d766b300d79e9ebd85dc5ae7bb327cf9c1a7c41
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] remove empty string (fixes a warning)

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3909

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3909/1

remove empty string (fixes a warning)

Ulfex warning: inavlid po attributes extracted from 
/home/timar/libreoffice-master/sysui/desktop/share/launcher_unityquicklist.ulf
No string specified!
GroupID: startcenter

Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a
---
M sysui/desktop/share/launcher_unityquicklist.ulf
1 file changed, 0 insertions(+), 3 deletions(-)



diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf 
b/sysui/desktop/share/launcher_unityquicklist.ulf
index 0f489bb..c41a645 100644
--- a/sysui/desktop/share/launcher_unityquicklist.ulf
+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
@@ -15,6 +15,3 @@
 
 [draw]
 en-US = "New Drawing"
-
-[startcenter]
-en-US = ""

-- 
To view, visit https://gerrit.libreoffice.org/3909
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: officecfg/registry

[Joren De Cuyper]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  122 
+-
 1 file changed, 64 insertions(+), 58 deletions(-)

New commits:
commit 833cafe4eb9e0bd6b599e8bcbb6d77f4f2243034
Author: Joren De Cuyper 
Date:   Sat May 11 12:16:00 2013 +0200

fdo#32368 - Link both Ctrl+Y as Ctrl+Shift+Z as shortcut keys for Redo

As discussed on the UX-advice and bug report itself,
we agreed to link both shortcut keys to the redo command.

Due 
http://opengrok.libreoffice.org/xref/core/framework/source/inc/accelerators/acceleratorcache.hxx#75
 :
/*map commands to keys in relation 1:n. First key is interpreted as 
preferred one!*/ the shortcut key
that is mentioned in the menu entry is ctrl+y (or cmd+y for Mac users).

UX-advice thread: 
http://lists.freedesktop.org/archives/libreoffice-ux-advise/2013-May/002033.html

Change-Id: I8d766b300d79e9ebd85dc5ae7bb327cf9c1a7c41
Reviewed-on: https://gerrit.libreoffice.org/3853
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index d2d7069..2ef7c67 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -190,22 +190,22 @@
   .uno:Repeat
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
   .uno:Redo
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
-  .uno:Undo
+  .uno:Redo
 
   
-  
+  
 
   I10N SHORTCUTS - NO 
TRANSLATE
-  .uno:Redo
+  .uno:Undo
 
   
 
@@ -1132,22 +1132,22 @@
 .uno:PasteSpecial
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -1248,22 +1248,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -1668,22 +1668,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -2447,22 +2447,22 @@
 .uno:RemoveDirectCharFormats
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -2927,22 +2927,22 @@
 .uno:Cut
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
 
@@ -3001,22 +3001,22 @@
 .uno:FullScreen
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Undo
+.uno:Redo
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:Redo
+.uno:Undo
   
 
   
@@ -3774,22 +3774,22 @@
 .uno:RemoveDirectCharFormats
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:Redo
   
 
-
+
   
   

[PUSHED] cppcheck: fix arrayIndexThenCheck/optimize loops

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3869

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3869
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If399abf5fb3eaea91f4f5d5e86b86b37790d3c9a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#55582 calc part

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3872

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3872
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/core/data/document.cxx |   25 +++--
 1 file changed, 15 insertions(+), 10 deletions(-)

New commits:
commit d3f08c67ac45024a65730e6a281a525b8159ef5a
Author: Julien Nabet 
Date:   Sun May 12 16:01:11 2013 +0200

cppcheck: fix arrayIndexThenCheck/optimize loops

Change-Id: If399abf5fb3eaea91f4f5d5e86b86b37790d3c9a
Reviewed-on: https://gerrit.libreoffice.org/3869
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8da6a51..d0ec99d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1831,9 +1831,10 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW 
nRow1, SCTAB nTab1,
 {
 bool bOldAutoCalc = pDestDoc->GetAutoCalc();
 pDestDoc->SetAutoCalc( false ); // avoid multiple calculations
-for (SCTAB i = nTab1; i <= nTab2 && i < 
static_cast(maTabs.size()); i++)
+SCTAB nMinSizeBothTabs = static_cast(std::min(maTabs.size(), 
pDestDoc->maTabs.size()));
+for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++)
 {
-if (maTabs[i] && i < static_cast(pDestDoc->maTabs.size()) 
&& pDestDoc->maTabs[i])
+if (maTabs[i] && pDestDoc->maTabs[i])
 maTabs[i]->CopyToTable( nCol1, nRow1, nCol2, nRow2, nFlags,
   bOnlyMarked, pDestDoc->maTabs[i], pMarks,
   false, bColRowFlags );
@@ -1884,8 +1885,9 @@ void ScDocument::CopyToDocument(const ScRange& rRange,
 pDestDoc->aDocName = aDocName;
 bool bOldAutoCalc = pDestDoc->GetAutoCalc();
 pDestDoc->SetAutoCalc( false ); // avoid multiple calculations
-for (SCTAB i = aNewRange.aStart.Tab(); i <= aNewRange.aEnd.Tab() && i < 
static_cast(maTabs.size()); i++)
-if (maTabs[i] && i < static_cast(pDestDoc->maTabs.size()) && 
pDestDoc->maTabs[i])
+SCTAB nMinSizeBothTabs = static_cast(std::min(maTabs.size(), 
pDestDoc->maTabs.size()));
+for (SCTAB i = aNewRange.aStart.Tab(); i <= aNewRange.aEnd.Tab() && i < 
nMinSizeBothTabs; i++)
+if (maTabs[i] && pDestDoc->maTabs[i])
 maTabs[i]->CopyToTable(aNewRange.aStart.Col(), 
aNewRange.aStart.Row(),
  aNewRange.aEnd.Col(), aNewRange.aEnd.Row(),
  nFlags, bOnlyMarked, pDestDoc->maTabs[i],
@@ -1908,9 +1910,10 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
 if (nTab1 > 0)
 CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, false, 
pDestDoc, pMarks );
 
-for (SCTAB i = nTab1; i <= nTab2 && i < static_cast(maTabs.size()); 
i++)
+SCTAB nMinSizeBothTabs = static_cast(std::min(maTabs.size(), 
pDestDoc->maTabs.size()));
+for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++)
 {
-if (maTabs[i] && i < static_cast(pDestDoc->maTabs.size()) && 
pDestDoc->maTabs[i])
+if (maTabs[i] && pDestDoc->maTabs[i])
 maTabs[i]->UndoToTable(aNewRange.aStart.Col(), 
aNewRange.aStart.Row(),
 aNewRange.aEnd.Col(), aNewRange.aEnd.Row(),
 nFlags, bOnlyMarked, pDestDoc->maTabs[i], 
pMarks);
@@ -2181,8 +2184,9 @@ void ScDocument::CopyRangeNamesToClip(ScDocument* 
pClipDoc, const ScRange& rClip
 return;
 
 std::set aUsedNames;// indexes of named ranges that 
are used in the copied cells
-for (SCTAB i = 0; i < static_cast(maTabs.size()); ++i)
-if (maTabs[i] && i < static_cast(pClipDoc->maTabs.size()) && 
pClipDoc->maTabs[i])
+SCTAB nMinSizeBothTabs = static_cast(std::min(maTabs.size(), 
pClipDoc->maTabs.size()));
+for (SCTAB i = 0; i < nMinSizeBothTabs; ++i)
+if (maTabs[i] && pClipDoc->maTabs[i])
 if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) )
 maTabs[i]->FindRangeNamesInUse(
 rClipRange.aStart.Col(), rClipRange.aStart.Row(),
@@ -2843,8 +2847,9 @@ void ScDocument::MixDocument( const ScRange& rRange, 
sal_uInt16 nFunction, bool
 {
 SCTAB nTab1 = rRange.aStart.Tab();
 SCTAB nTab2 = rRange.aEnd.Tab();
-for (SCTAB i = nTab1; i <= nTab2 && i < static_cast(maTabs.size()); 
i++)
-if (maTabs[i] && i < static_cast(pSrcDoc->maTabs.size()) && 
pSrcDoc->maTabs[i])
+SCTAB nMinSizeBothTabs = static_cast(std::min(maTabs.size(), 
pSrcDoc->maTabs.size()));
+for (SCTAB i = nTab1; i <= nTab2 && i < nMinSizeBothTabs; i++)
+if (maTabs[i] && pSrcDoc->maTabs[i])
 maTabs[i]->MixData( rRange.aStart.Col(), rRange.aStart.Row(),
 rRange.aEnd.Col(), rRange.aEnd.Row(),
 nFunction, bSkipEmpty, pSrcDoc->maTabs[i] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libr

[Libreoffice-commits] core.git: Branch 'feature/gengal' - extras/Gallery_arrows.mk extras/Gallery_diagrams.mk extras/Gallery_education.mk extras/Gallery_environment.mk extras/Gallery_finance.mk extras

[Michael Meeks]

 extras/Gallery_arrows.mk  |4 ++--
 extras/Gallery_diagrams.mk|4 ++--
 extras/Gallery_education.mk   |4 ++--
 extras/Gallery_environment.mk |4 ++--
 extras/Gallery_finance.mk |4 ++--
 extras/Gallery_people.mk  |4 ++--
 extras/Gallery_sound.mk   |4 ++--
 extras/Gallery_symbols.mk |4 ++--
 extras/source/gallery/share/gallery_names.ulf |2 +-
 extras/source/gallery/sounds/sound.str|2 --
 extras/source/gallery/sounds/sounds.str   |2 ++
 scp2/source/ooo/file_extra_ooo.scp|2 +-
 solenv/gbuild/Gallery.mk  |2 ++
 13 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 135bf344beb3244f10db2c09195588e17e80d6b2
Author: Michael Meeks 
Date:   Tue May 14 14:49:47 2013 +0100

gallery: fix a number of naming thinkos.

Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085

diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk
index 6bd51e8..99de5db 100644
--- a/extras/Gallery_arrows.mk
+++ b/extras/Gallery_arrows.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/arrows))
+$(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/arrows,\
+$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\
extras/source/gallery/arrows/A01-Arrow-Gray-Left.png \
extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.png \
extras/source/gallery/arrows/A03-Arrow-Gray-Left.png \
diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk
index b4ca53a..bef5e96 100644
--- a/extras/Gallery_diagrams.mk
+++ b/extras/Gallery_diagrams.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/diagrams))
+$(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/diagrams,\
+$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\

extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.png \
extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.png \
extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.png 
\
diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
index 1e90ae6..a069589 100644
--- a/extras/Gallery_education.mk
+++ b/extras/Gallery_education.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/education))
+$(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/education,\
+$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\
extras/source/gallery/education/Blackboard.png \
extras/source/gallery/education/Books.png \
extras/source/gallery/education/Chalk.png \
diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk
index 154e4a8..16b4be2 100644
--- a/extras/Gallery_environment.mk
+++ b/extras/Gallery_environment.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/environment))
+$(eval $(call 
gb_Gallery_Gallery,environment,extras/source/gallery/environment))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/environment,\
+$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\
extras/source/gallery/environment/DrippingFaucet.png \
extras/source/gallery/environment/Earth.png \
extras/source/gallery/environment/EndangeredAnimals1.png \
diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk
index cf7c991..c53d0d7 100644
--- a/extras/Gallery_finance.mk
+++ b/extras/Gallery_finance.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/finance))
+$(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/finance,\
+$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\
extras/source/gallery/finance/Agreement.png \
extras/source/gallery/finance/ATM01.png \
extras/source/gallery/finance/ATM02.png \
diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk
index b42c412..41adf78 100644
--- a/extras/Gallery_people.mk
+++ b/extras/Gallery_people.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/people))
+$(eval $(call gb_Galle

[Libreoffice-commits] core.git: sc/sdi sc/source

[Lennard Wasserthal]

 sc/sdi/drawsh.sdi |1 +
 sc/source/ui/drawfunc/drawsh5.cxx |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9fa5c64eeb5d038a5fac25dfd80e72bd22b5ed18
Author: Lennard Wasserthal 
Date:   Sun May 12 17:50:12 2013 +0200

fdo#55582 calc part

Since the actual Patch for fdo#55582 hangs on the writer part,
I commit that bloody sc part NOW,
to appear as early as in 4.1.

Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2
Signed-off-by: Lennard Wasserthal 
Reviewed-on: https://gerrit.libreoffice.org/3872
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 6c9ec0b..ff8cd35 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -142,6 +142,7 @@ interface TableDraw
 SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = 
GetDrawFuncState; Export = FALSE; ]
 SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = 
GetDrawFuncState; Export = FALSE; ]
 SID_COPY[ ExecMethod = ExecDrawFunc; StateMethod = 
GetDrawFuncState; Export = FALSE; ]
+SID_PASTE   [ ExecMethod = ExecDrawFunc; StateMethod = 
GetDrawFuncState; Export = FALSE; ]
 SID_SELECTALL   [ ExecMethod = ExecDrawFunc; StateMethod = 
GetDrawFuncState; Export = FALSE; ]
 SID_OBJECT_ROTATE   [ ExecMethod = ExecDrawFunc; StateMethod = GetState; 
Export = FALSE; ]
 SID_OBJECT_MIRROR   [ ExecMethod = ExecDrawFunc; StateMethod = GetState; 
Export = FALSE; ]
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx 
b/sc/source/ui/drawfunc/drawsh5.cxx
index 153ea16..8a82fda 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -357,7 +358,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 break;
 
 case SID_PASTE:
-OSL_FAIL( "SdrView::PasteClipboard not supported anymore" );
+ScClipUtil::PasteFromClipboard ( GetViewData(), 
GetViewData()->GetViewShell(), true );
 break;
 
 case SID_SELECTALL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Euro Converter Wizard

[Olivier Hallot]

Hi Xisco

No one uses it in Latin America.

Olivier Hallot
The Document Foundation
Em 14/05/2013 07:54, "Xisco Faulí"  escreveu:

> Hello all,
>
> Euro Converter Wizard has become a bit outdated nowadays and I'm wondering
> if it'd convenient to get rid of it.
>
> Personally I'd do so, but I'd like to hear from you, especially from the
> libreoffice expect to decide together what's the best.
> So please, I'd appreciate if you could share your thoughts about it.
>
> Regards
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3908

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/3908/1

drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

See
http://lists.freedesktop.org/archives/libreoffice/2013-May/051706.html
for explanation.

Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
---
M config_host.mk.in
M solenv/bin/modules/installer/scriptitems.pm
M solenv/bin/ooinstall
3 files changed, 2 insertions(+), 71 deletions(-)



diff --git a/config_host.mk.in b/config_host.mk.in
index 02da41e..cc626e0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -88,7 +88,6 @@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
-export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index cd4b141..3406e2f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -926,15 +926,7 @@
 $onefile = "";  # the sourcepath has to be empty
 if ( $write_logfile)
 {
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-$infoline = "WARNING: Source for $$searchfilenameref not 
found!\n";  # Important message in log file
-}
-else
-{
-$infoline = "ERROR: Source for $$searchfilenameref not 
found!\n";# Important message in log file
-}
-
+$infoline = "ERROR: Source for $$searchfilenameref not found!\n";  
  # Important message in log file
 push( @installer::globals::logfileinfo, $infoline);
 }
 }
@@ -1002,15 +994,7 @@
 $onefile = "";  # the sourcepath has to be empty
 if ( $write_logfile)
 {
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-$infoline = "WARNING: Source for $$searchfilenameref not 
found!\n";  # Important message in log file
-}
-else
-{
-$infoline = "ERROR: Source for $$searchfilenameref not 
found!\n";# Important message in log file
-}
-
+$infoline = "ERROR: Source for $$searchfilenameref not found!\n";  
  # Important message in log file
 push( @installer::globals::logfileinfo, $infoline);
 }
 }
@@ -1097,54 +1081,6 @@
 else { $sourcepathref = 
get_sourcepath_from_filename_and_includepath(\$onefilename, 
$includepatharrayref, 1); }
 
 $onefile->{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is 
empty, if no source was found
-
-# defaulting to english for multilingual files if 
DEFAULT_TO_ENGLISH_FOR_PACKING is set
-
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-if (( ! $onefile->{'sourcepath'} ) && ( 
$onefile->{'ismultilingual'} ))
-{
-my $oldname = $onefile->{'Name'};
-my $oldlanguage = $onefile->{'specificlanguage'};
-my $newlanguage = "en-US";
-$onefilename = $onefile->{'Name'};
-$onefilename =~ s/$oldlanguage\./$newlanguage\./;   # Example: 
tplwizfax_it.zip -> tplwizfax_en-US.zip
-$onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
 # filename begins with a slash, for instance 
/registry/schema/org/openoffice/VCL.xcs
-$sourcepathref = 
get_sourcepath_from_filename_and_includepath(\$onefilename, 
$includepatharrayref, 1);
-$onefile->{'sourcepath'} = $$sourcepathref;
 # This $$sourcepathref is empty, if no source was found
-
-if ($onefile->{'sourcepath'})   # defaulting to english was 
successful
-{
-$infoline = "WARNING: Using $onefilename instead of 
$oldname\n";
-push( @installer::globals::logfileinfo, $infoline);
-print "$infoline";
-
-# If the directory, in which the new file is installed, is 
not language dependent,
-# the filename has to be changed to avoid installation 
conflicts
-# No mechanism for resource files!
-# -> implementing for the content of ARCHIVE files
-
-if ( $onefile->{'Styles'} =~ /\bARCHIVE\b/ )
-{
-my $directorygid = $onefile->{'Dir'};
-my $islanguagedependent = 
determine_directory_language_dependency($directorygid, $dirsref);
-
-if ( ! $islanguagedependent )
-{
-$onefile->{'Styles'} =~ s/\bARCHIVE\b/ARCHIVE, 
RENAME_TO_LANGUAGE/; # Se

Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING?

[David Tardon]

Hi,

this review: https://gerrit.libreoffice.org/3908 drops (now unneeded)
DEFAULT_TO_ENGLISH_FOR_PACKING and the installer code that handles it.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - officecfg/registry sfx2/inc sfx2/source svx/source

[Oliver-Rainer Wittmann]

 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |1 
 sfx2/inc/sfx2/sidebar/EnumContext.hxx  |1 
 sfx2/source/sidebar/EnumContext.cxx|3 
 sfx2/source/sidebar/ResourceManager.cxx|1 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx|   94 ++-
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx|2 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |  118 
--
 svx/source/sidebar/paragraph/ParaPropertyPanel.hrc |1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx|7 
 9 files changed, 90 insertions(+), 138 deletions(-)

New commits:
commit de52e4d0e544f6a6c2ab51631870d682885c30cd
Author: Oliver-Rainer Wittmann 
Date:   Tue May 14 13:37:28 2013 +

correct context switch handling in paragraph property panel and position 
and size property panel

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 92c8043..349a62f 100755
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -471,24 +471,19 @@ void ParaLineSpacingControl::Rearrange(SfxItemState 
currSPState,FieldUnit currMe
 
 aLineDist.SaveValue();
 
-sal_uInt16 uCount = aLineDist.GetEntryCount();
+const sal_uInt16 uCount = aLineDist.GetEntryCount();
 if( uCount == LLINESPACE_FIX + 1 )
 {
-switch (currentContext.GetCombinedContext())
+switch (currentContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Impress, Context_Table):
-case CombinedEnumContext(Application_Draw, Context_Table):
-case CombinedEnumContext(Application_Writer, Context_DrawText):
-case CombinedEnumContext(Application_Calc, Context_DrawText):
-case CombinedEnumContext(Application_Draw, Context_DrawText):
-case CombinedEnumContext(Application_Impress, 
Context_DrawText):
-case CombinedEnumContext(Application_Writer, Context_Annotation):
-case CombinedEnumContext(Application_Draw, Context_Draw):
-case CombinedEnumContext(Application_Draw, Context_TextObject):
-case CombinedEnumContext(Application_Draw, Context_Graphic):
-case CombinedEnumContext(Application_Impress, Context_Draw):
-case CombinedEnumContext(Application_Impress, 
Context_TextObject):
-case CombinedEnumContext(Application_Impress, Context_Graphic):
+case CombinedEnumContext(Application_DrawImpress, Context_Table):
+case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+case CombinedEnumContext(Application_Calc, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Annotation):
 {
 aLineDist.RemoveEntry(LLINESPACE_FIX);
 }
@@ -496,11 +491,11 @@ void ParaLineSpacingControl::Rearrange(SfxItemState 
currSPState,FieldUnit currMe
 }
 else if( uCount == LLINESPACE_FIX)
 {
-switch (currentContext.GetCombinedContext())
+switch (currentContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Writer, Context_Default):
-case CombinedEnumContext(Application_Writer, Context_Text):
-case CombinedEnumContext(Application_Writer, Context_Table):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Default):
+case CombinedEnumContext(Application_WriterVariants, Context_Text):
+case CombinedEnumContext(Application_WriterVariants, 
Context_Table):
 {
 aLineDist.InsertEntry(String::CreateFromAscii("Fixed"), 
LLINESPACE_FIX);
 }
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index c49a55a..6c0dfc5 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -837,20 +837,20 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, 
ToolBox *, pControl)
 {
 switch (pControl->GetCurItemId())
 {
-case INDENT_INCREMENT:
+case INDENT_INCREMENT:
 {
-switch (maContext.GetCombinedContext())
+switch (maContext.GetCombinedContext_DI())
 {
-case CombinedEnumContext(Application_Writer, Context_Default):
-case CombinedEnumContext(Application_Writer, Con

[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3771

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3771
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I80aca85562e4a43fded5c37f9895e51f79e42c14
Gerrit-PatchSet: 8
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Chris Sherlock 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Norbert Thiebaud 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - scp2/source sw/source

[David Tardon]

 scp2/source/ooo/directory_ooo.scp|   11 +
 scp2/source/ooo/module_lang_template.scp |3 +
 sw/source/ui/inc/glosdoc.hxx |3 -
 sw/source/ui/misc/glosdoc.cxx|   60 ---
 4 files changed, 46 insertions(+), 31 deletions(-)

New commits:
commit 16a0badd3ec3588d4a6561a3cba7992cbef6b5da
Author: David Tardon 
Date:   Tue May 14 15:53:23 2013 +0200

always create dirs for autotext files

... thus avoiding an annoing warning when a user tries to use autotext.

I think we can drop DEFAULT_TO_ENGLISH_FOR_PACKING now.

Change-Id: I230341c8bf1c925c51a4059b93153d5cd83d5310

diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 08ea22d..fda0f9c 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -156,6 +156,17 @@ End
 
 #endif
 
+Directory gid_Dir_Share_Autotext
+ParentID = gid_Brand_Dir_Share;
+DosName = "autotext";
+End
+
+Directory gid_Dir_Autotext_Language
+ParentID = gid_Dir_Share_Autotext;
+DIR_ISOLANGUAGE_ALL_LANG_2;
+Styles = (CREATE);
+End
+
 Directory gid_Dir_Share_Xslt
 ParentID = gid_Brand_Dir_Share;
 DosName = "xslt";
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 1b8e45f..0b51889 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -62,7 +62,8 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Registry_Ctl_Xcd,
  gid_File_Share_Registry_Ctlseqcheck_Xcd,
  gid_File_InfoPlist_Lang);
-Dirs = (gid_Dir_Samples_Language);
+Dirs = (gid_Dir_Samples_Language,
+gid_Dir_Autotext_Language);
 End
 
 Module gid_Module_Langpack_Resource_Template
commit fbed11a411eb3c013f465660c5cd3e6db0508806
Author: David Tardon 
Date:   Tue May 14 14:32:08 2013 +0200

don't accumulate dirs in error string

Change-Id: Ied7437026009f07052dd07d41ba08c82bb6db295

diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index 6ab31ac..a3a6c79 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -50,8 +50,7 @@ class SW_DLLPUBLIC SwGlossaries
 UnoAutoTextEntries  m_aGlossaryEntries;
 
 String  m_aPath;
-String  m_sOldErrPath;
-String  m_sErrPath;
+std::vector m_aInvalidPaths;
 std::vector m_PathArr;
 std::vector m_GlosArr;
 sal_Boolm_bError;
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index e869643..681be51 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -397,6 +397,20 @@ SwGlossaries::SwGlossaries()
 Description: set new path and recreate internal array
 */
 
+rtl::OUString lcl_makePath(const std::vector& rPaths)
+{
+std::vector::const_iterator aIt(rPaths.begin());
+const std::vector::const_iterator aEnd(rPaths.end());
+rtl::OUStringBuffer aPath(*aIt);
+for (++aIt; aIt != aEnd; ++aIt)
+{
+aPath.append(SVT_SEARCHPATH_DELIMITER);
+const INetURLObject aTemp(*aIt);
+aPath.append(aTemp.GetFull());
+}
+return aPath.getStr();
+}
+
 void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
 {
 SvtPathOptions aPathOpt;
@@ -410,6 +424,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
 
 sal_uInt16 nTokenCount = comphelper::string::getTokenCount(m_aPath, 
SVT_SEARCHPATH_DELIMITER);
 std::vector aDirArr;
+std::vector aInvalidPaths;
 for( sal_uInt16 i = 0; i < nTokenCount; i++ )
 {
 String sPth(m_aPath.GetToken(i, SVT_SEARCHPATH_DELIMITER));
@@ -422,26 +437,27 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
 }
 aDirArr.push_back(sPth);
 if( !FStatHelper::IsFolder( sPth ) )
-{
-if( m_sErrPath.Len() )
-m_sErrPath += SVT_SEARCHPATH_DELIMITER;
-INetURLObject aTemp( sPth );
-m_sErrPath += String(aTemp.GetFull());
-}
+aInvalidPaths.push_back(sPth);
 else
 m_PathArr.push_back(sPth);
 }
 
-if(!nTokenCount ||
-(m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != 
m_sErrPath)) )
+if(!nTokenCount || !aInvalidPaths.empty())
 {
-m_sOldErrPath = m_sErrPath;
-// wrong path, that means AutoText directory doesn't exist
+std::sort(aInvalidPaths.begin(), aInvalidPaths.end());
+aInvalidPaths.erase(std::unique(aInvalidPaths.begin(), 
aInvalidPaths.end()), aInvalidPaths.end());
+if (bPathChanged || (m_aInvalidPaths != aInvalidPaths))
+{
+m_aInvalidPaths = aInvalidPaths;
+// wrong path, t

[Libreoffice-commits] core.git: include/sal xmloff/source

[Radu Ioan]

 include/sal/log-areas.dox  |4 +-
 xmloff/source/core/RDFaImportHelper.cxx|   33 +--
 xmloff/source/core/xmlexp.cxx  |   32 +++
 xmloff/source/core/xmlimp.cxx  |   42 +++--
 xmloff/source/draw/sdxmlimp.cxx|6 +--
 xmloff/source/text/txtparai.cxx|   37 ++
 xmloff/source/transform/EventOASISTContext.cxx |6 +--
 xmloff/source/transform/Oasis2OOo.cxx  |8 ++--
 8 files changed, 79 insertions(+), 89 deletions(-)

New commits:
commit ac937d8be69953abcaf1365644c6607c279f37a6
Author: Radu Ioan 
Date:   Sat May 4 01:40:09 2013 +0300

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

 - replaced osl_trace with sal_info
 - replaced dbg_* with sal_*

Change-Id: I80aca85562e4a43fded5c37f9895e51f79e42c14
Reviewed-on: https://gerrit.libreoffice.org/3771
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d809e45..9257dee 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -303,9 +303,12 @@ certain functionality.
 @section xmloff
 
 @li @c xmloff.core
+@li @c xmloff.draw
 @li @c xmloff.forms
 @li @c xmloff.chart
 @li @c xmloff.style
+@li @c xmloff.text
+@li @c xmloff.transform
 
 @section xmlsecurity
 
@@ -358,7 +361,6 @@ certain functionality.
 @li @c uui
 @li @c vbahelper
 @li @c xmlhelp
-@li @c xmloff
 @li @c xmlreader
 
 */
diff --git a/xmloff/source/core/RDFaImportHelper.cxx 
b/xmloff/source/core/RDFaImportHelper.cxx
index e377894..3ff61d1 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -191,7 +191,7 @@ RDFaReader::ReadCURIE(OUString const & i_rCURIE) const
 }
 else
 {
-OSL_ENSURE(XML_NAMESPACE_NONE != nKey, "no namespace?");
+SAL_WARN_IF(XML_NAMESPACE_NONE == nKey, "xmloff.core", "no 
namespace?");
 if ((XML_NAMESPACE_UNKNOWN != nKey) &&
 (XML_NAMESPACE_XMLNS   != nKey))
 {
@@ -201,12 +201,12 @@ RDFaReader::ReadCURIE(OUString const & i_rCURIE) const
 }
 else
 {
-OSL_TRACE( "ReadCURIE: invalid CURIE: invalid prefix" );
+SAL_INFO("xmloff.core", "ReadCURIE: invalid CURIE: invalid 
prefix" );
 return OUString();
 }
 }
 }
-OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" );
+SAL_INFO("xmloff.core", "ReadCURIE: invalid CURIE: no prefix" );
 return OUString();
 }
 
@@ -229,7 +229,7 @@ RDFaReader::ReadCURIEs(OUString const & i_rCURIEs) const
 while (!CURIEs.isEmpty());
 if (vec.empty())
 {
-OSL_TRACE( "ReadCURIEs: invalid CURIEs" );
+SAL_INFO("xmloff.core", "ReadCURIEs: invalid CURIEs" );
 }
 return vec;
 }
@@ -246,7 +246,7 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const & 
i_rURIOrSafeCURIE) const
 }
 else
 {
-OSL_TRACE( "ReadURIOrSafeCURIE: invalid SafeCURIE" );
+SAL_INFO("xmloff.core", "ReadURIOrSafeCURIE: invalid SafeCURIE" );
 return OUString();
 }
 }
@@ -254,7 +254,7 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const & 
i_rURIOrSafeCURIE) const
 {
 if (i_rURIOrSafeCURIE.matchAsciiL("_:", 2)) // blank node
 {
-OSL_TRACE( "ReadURIOrSafeCURIE: invalid URI: scheme is _" );
+SAL_INFO("xmloff.core", "ReadURIOrSafeCURIE: invalid URI: scheme 
is _" );
 return OUString();
 }
 else
@@ -282,7 +282,7 @@ RDFaInserter::MakeURI( OUString const & i_rURI) const
 {
 if (i_rURI.matchAsciiL("_:", 2)) // blank node
 {
-OSL_TRACE("MakeURI: cannot create URI for blank node");
+SAL_INFO("xmloff.core", "MakeURI: cannot create URI for blank node");
 return 0;
 }
 else
@@ -293,7 +293,7 @@ RDFaInserter::MakeURI( OUString const & i_rURI) const
 }
 catch (uno::Exception &)
 {
-OSL_FAIL("MakeURI: cannot create URI");
+SAL_WARN("xmloff.core", "MakeURI: cannot create URI");
 return 0;
 }
 }
@@ -309,7 +309,7 @@ RDFaInserter::MakeResource( OUString const & i_rResource)
 // N.B.: content.xml and styles.xml are distinct graphs
 OUString name( i_rResource.copy(2) );
 const uno::Reference< rdf::XBlankNode > xBNode( LookupBlankNode(name) 
);
-OSL_ENSURE(xBNode.is(), "no blank node?");
+SAL_WARN_IF(!xBNode.is(), "xmloff.core", "no blank node?");
 return uno::Reference( xBNode, uno::UNO_QUERY);
 }
 else
@@ -334,8 +334,7 @@ public:
 void RDFaInserter::InsertRDFaEntry(
 struct RDFaEntry const & i_rEntry)
 {
-OSL_ENSURE(i_rEntry.m_xObject.is(),
-"InsertRDFaEntry: invalid arg: null object");
+SAL_WARN_IF(!i_rEntry.m_xObject.is(), "

Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING?

[David Tardon]

Hi,

On Tue, May 07, 2013 at 07:08:16PM +0200, Andras Timar wrote:
> No, I don't think we want install sets without en-US. But we need to
> make sure that we don't have runtime problems when a localized file is
> missing. Now there is the en-US copy, but after your proposed patch
> there will be nothing. Not many language dependent files remained, I
> think AutoText files are the only example. I manually removed an
> autotext folder and I got a message box: Inadmissible path.
> C:\LibreOffice\4.0.3.3\program\..\share\autotext\hu does not exist.

Yes, this warning is annoying, but it is only shown the first time in
the run (after I fixed the original code, that just appended the same
path again and again, showing ever lengthening error string).

> Probably the folder is created by the installer anyway.

No, it is not. But it can be done. In fact, I have already done it.
So even the warning goes away :-)

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/shells...

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3890

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3890
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/utlui/

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3891

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3891
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie150e8812b674a9fdd0cb904489dfb561bdcf7a2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar...

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3893

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3893
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I048ff445fa04b12cb86ae580370bfe444041d41f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Matthias Freund]

 sw/source/ui/shells/textsh.cxx  |   20 ++--
 sw/source/ui/shells/textsh1.cxx |   26 +-
 sw/source/ui/shells/txtattr.cxx |   18 --
 sw/source/ui/shells/txtcrsr.cxx |1 -
 sw/source/ui/shells/txtnum.cxx  |   12 +---
 5 files changed, 36 insertions(+), 41 deletions(-)

New commits:
commit e76e427ee68f4717a143a20733b09e845d73921d
Author: Matthias Freund 
Date:   Mon May 13 20:32:43 2013 +0200

fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 4)

The last files of this directory. :-)

Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d
Reviewed-on: https://gerrit.libreoffice.org/3890
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 0a63d1c..6aa8ee5 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -74,7 +74,7 @@
 #include 
 #include 
 #include 
-#include// fuer Undo-IDs
+#include// for Undo-IDs
 #include 
 #include 
 #include 
@@ -215,7 +215,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 
 if ( ERRCODE_NONE == aDlg.Execute() )
 {
-// URL ermitteln
+// Determine URL
 String aStrURL( aDlg.GetPath() );
 aStrURL = URIHelper::SmartRel2Abs(
 INetURLObject(), aStrURL, URIHelper::GetMaybeFileHdl() );
@@ -505,7 +505,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 }
 
 }
-// Rahmen neu anlegen
+// Create new border
 SwFlyFrmAttrMgr aMgr( sal_True, GetShellPtr(), FRMMGR_TYPE_TEXT );
 if(pArgs)
 {
@@ -567,7 +567,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 aSet.Put(aMgr.GetAttrSet());
 aSet.SetParent( aMgr.GetAttrSet().GetParent() );
 
-// Minimalgroesse in Spalten loeschen
+// Delete minimum size in columns.
 SvxBoxInfoItem aBoxInfo((SvxBoxInfoItem 
&)aSet.Get(SID_ATTR_BORDER_INNER));
 const SvxBoxItem& rBox = (const SvxBoxItem&)aSet.Get(RES_BOX);
 aBoxInfo.SetMinDist(sal_False);
@@ -592,7 +592,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 aMgr.SetAttrSet(*pOutSet);
 
-// beim ClickToEditFeld erst die Selektion loeschen
+// At first delete the selection at the ClickToEditField.
 if( rShell.IsInClickToEdit() )
 rShell.DelRight();
 
@@ -751,7 +751,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 if( pMacro )
 
aHLinkItem.SetMacro(HYPERDLG_EVENT_MOUSEOUT_OBJECT, *pMacro);
 
-// Text des Links besorgen
+// Get the text of the Link.
 rSh.StartAction();
 rSh.CreateCrsr();
 
rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT,sal_True);
@@ -960,10 +960,10 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
 aFontName = aFont.GetFamilyName();
 }
 
-Font aNewFont(aFontName, Size(1,1)); // Size nur wg. CTOR
+Font aNewFont(aFontName, Size(1,1)); // Size only because CTOR.
 if( !aChars.Len() )
 {
-// Eingestellten Font als Default
+// Set selected font as default.
 SfxAllItemSet aAllSet( rSh.GetAttrPool() );
 aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
 
@@ -1004,7 +1004,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
 {
 rSh.StartAllAction();
 
-// Selektierten Inhalt loeschen
+// Delete selected content.
 SwRewriter aRewriter;
 aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_SPECIALCHAR));
 
@@ -1026,7 +1026,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
 GetI18NScriptTypeOfLanguage( 
(sal_uInt16)GetAppLanguage() ) ));
 }
 
-// Zeichen einfuegen
+// Insert character.
 rSh.Insert( aChars );
 
 // #108876# a font attribute has to be set always due to a guessed 
script type
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 7a05da5..ce79e21 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -68,7 +68,7 @@
 #include 
 #include 
 #include 
-#include// fuer Undo-IDs
+#include// for Undo-IDs
 #include 
 #include 
 #include 
@@ -152,8 +152,8 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, 
sal_uInt16 nSlot,const
 }
 aCoreSet.Put( SfxUInt16Item( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
 rWrtSh.GetScalingOfSelectedText() ) );
-// Das CHRATR_BACKGROUND-Attribut wird fuer den Dialog in
-// ein RES_BACKGROUND verwandelt und wieder zurueck ...
+// The CHRATR_BACKGROUND attribute will be con

[Libreoffice-commits] core.git: sw/source

[Matthias Freund]

 sw/source/ui/utlui/attrdesc.src |6 +++---
 sw/source/ui/utlui/initui.src   |5 ++---
 sw/source/ui/utlui/navipi.src   |6 ++
 sw/source/ui/utlui/poolfmt.src  |   21 ++---
 sw/source/ui/utlui/utlui.src|5 ++---
 5 files changed, 19 insertions(+), 24 deletions(-)

New commits:
commit d90dd83765bfabfe9dbf91c7ece886986620e6d4
Author: Matthias Freund 
Date:   Mon May 13 21:03:27 2013 +0200

fdo#39468 Comment translation GER-ENG in sw/source/ui/utlui/

Some of the files I had missed.

Change-Id: Ie150e8812b674a9fdd0cb904489dfb561bdcf7a2
Reviewed-on: https://gerrit.libreoffice.org/3891
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sw/source/ui/utlui/attrdesc.src b/sw/source/ui/utlui/attrdesc.src
index c820236..cd14d9e 100644
--- a/sw/source/ui/utlui/attrdesc.src
+++ b/sw/source/ui/utlui/attrdesc.src
@@ -19,9 +19,9 @@
 
 #include "globals.hrc"
 #include "attrdesc.hrc"
-/*-
-Strings fuer textuelle Attribute
- -*/
+
+// Strings for textual attributes.
+
 String STR_DROP_OVER
 {
 Text [ en-US ] = "Drop Caps over" ;
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src
index d02ecd9..e2fdbff 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/ui/utlui/initui.src
@@ -22,9 +22,8 @@
 #include "helpid.h"
 #include "initui.hrc"
 
-/*-
-Fehler Calculator
- -*/
+// Error calculator
+
 Resource RID_SW_SHELLRES
 {
 String STR_POSTIT_PAGE
diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src
index 13ec365..66bda96 100644
--- a/sw/source/ui/utlui/navipi.src
+++ b/sw/source/ui/utlui/navipi.src
@@ -47,9 +47,7 @@ Window DLG_NAVIGATION_PI
 {
 198;
 };
-
/
-Toolbox ab 323 x
-/
+// Toolbox from 323 x
 #define NAVI_IDLIST \
 IdList =\
 {   \
@@ -330,7 +328,7 @@ Window DLG_NAVIGATION_PI
 Spin = TRUE ;
 Minimum = 1 ;
 First = 1 ;
- // Outline als Default
+ // Outline as default
 Maximum = 5 ;
 Last = 5 ;
 Value = 5 ;
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
index 60f7758..2ebb679 100644
--- a/sw/source/ui/utlui/poolfmt.src
+++ b/sw/source/ui/utlui/poolfmt.src
@@ -18,9 +18,8 @@
  */
 #include "poolfmt.hrc"
 
- // -
- // Format-Namen
- // -
+ // Format names
+
 String STR_POOLCHR_FOOTNOTE
 {
 Text [ en-US ] = "Footnote Characters" ;
@@ -86,7 +85,7 @@ String STR_POOLCHR_ENDNOTE_ANCHOR
 Text [ en-US ] = "Endnote Anchor";
 };
 
- // Zeichenvorlagen fuer HTML
+ // Drawing templates for HTML
 String STR_POOLCHR_HTML_EMPHASIS
 {
 Text [ en-US ] = "Emphasis" ;
@@ -124,7 +123,7 @@ String STR_POOLCHR_HTML_TELETYPE
 Text [ en-US ] = "Teletype" ;
 };
 
-// Rahmenvorlagen
+// Border templates
 String STR_POOLFRM_FRAME
 {
 Text [ en-US ] = "Frame" ;
@@ -153,9 +152,9 @@ String STR_POOLFRM_LABEL
 {
 Text [ en-US ] = "Labels" ;
 };
- // -
- // Vorlagen-Namen
- // -
+
+ // Template names
+
 String STR_POOLCOLL_STANDARD
 {
 Text [ en-US ] = "Default Style" ;
@@ -682,9 +681,9 @@ String STR_POOLPAGE_ENDNOTE
 {
 Text [ en-US ] = "Endnote" ;
 };
-/*
- Numerierungs Regeln
-*/
+
+// Numbering rules
+
 String STR_POOLNUMRULE_NUM1
 {
 Text [ en-US ] = "Numbering 1" ;
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 53f5b94..5c06bcb 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -118,9 +118,8 @@ Resource RID_SHELLRES_AUTOFMTSTRS
 
 };
 
-/*-
-Diverses
- -*/
+// Miscellaneous
+
 String STR_EVENT_OBJECT_SELECT
 {
 Text [ en-US ] = "Click object" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Matthias Freund]

 sw/source/ui/ribbar/conarc.cxx |   45 -
 sw/source/ui/ribbar/concustomshape.cxx |   30 --
 sw/source/ui/ribbar/conform.cxx|9 -
 sw/source/ui/ribbar/conpoly.cxx|   42 
 sw/source/ui/ribbar/conrect.cxx|   15 ---
 sw/source/ui/ribbar/drawbase.cxx   |  164 +++--
 sw/source/ui/ribbar/dselect.cxx|   25 -
 sw/source/ui/ribbar/inputwin.cxx   |   66 +++--
 sw/source/ui/web/web.src   |6 -
 9 files changed, 65 insertions(+), 337 deletions(-)

New commits:
commit 596bd36951a4b4b98239749d5913da61143e6d48
Author: Matthias Freund 
Date:   Mon May 13 22:53:34 2013 +0200

fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/

cleanups and translations - and a forgotten file.

Change-Id: I048ff445fa04b12cb86ae580370bfe444041d41f
Reviewed-on: https://gerrit.libreoffice.org/3893
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/ui/ribbar/conarc.cxx
index 93dcf6b..d3cf4d1 100644
--- a/sw/source/ui/ribbar/conarc.cxx
+++ b/sw/source/ui/ribbar/conarc.cxx
@@ -19,36 +19,17 @@
 
 #include 
 
-
 #include "view.hxx"
 #include "edtwin.hxx"
 #include "wrtsh.hxx"
 #include "drawbase.hxx"
 #include "conarc.hxx"
 
-
-
-/*
-|*
-|* Konstruktor
-|*
-\/
-
-
-
 ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView)
 : SwDrawBase(pWrtShell, pEditWin, pSwView), nAnzButUp(0)
 {
 }
 
-/*
-|*
-|* MouseButtonDown-event
-|*
-\/
-
-
-
 sal_Bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 {
 sal_Bool bReturn;
@@ -61,14 +42,6 @@ sal_Bool ConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 return (bReturn);
 }
 
-/*
-|*
-|* MouseButtonUp-event
-|*
-\/
-
-
-
 sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 {
 sal_Bool bReturn = sal_False;
@@ -84,7 +57,7 @@ sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 else
 {   nAnzButUp++;
 
-if (nAnzButUp == 3) // Kreisbogenerzeugung beendet
+if (nAnzButUp == 3) // Generating of circular arc finished
 {
 SwDrawBase::MouseButtonUp(rMEvt);
 nAnzButUp = 0;
@@ -98,14 +71,6 @@ sal_Bool ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 return (bReturn);
 }
 
-/*
-|*
-|* Function aktivieren
-|*
-\/
-
-
-
 void ConstArc::Activate(const sal_uInt16 nSlotId)
 {
 switch (nSlotId)
@@ -127,12 +92,6 @@ void ConstArc::Activate(const sal_uInt16 nSlotId)
 SwDrawBase::Activate(nSlotId);
 }
 
-/*
-|*
-|* Funktion deaktivieren
-|*
-\/
-
 void ConstArc::Deactivate()
 {
 nAnzButUp = 0;
@@ -140,6 +99,4 @@ void ConstArc::Deactivate()
 SwDrawBase::Deactivate();
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/ribbar/concustomshape.cxx 
b/sw/source/ui/ribbar/concustomshape.cxx
index 31b4885..58e3747 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -45,11 +45,6 @@
 
 #include 
 
-/*
-|*
-|* C'Tor
-|*
-\/
 ConstCustomShape::ConstCustomShape( SwWrtShell* pWrtShell, SwEditWin* 
pEditWin, SwView* pSwView, SfxRequest& rReq )
 : SwDrawBase( pWrtShell, pEditWin, pSwView )
 {
@@ -61,7 +56,6 @@ OUString ConstCustomShape::GetShapeType() const
 return aCustomShape;
 }
 
-//static
 OUString ConstCustomShape::GetShapeTypeFromRequest( SfxRequest& rReq )
 {
 OUString aRet;
@@ -74,12 +68,6 @@ OUString ConstCustomShape::GetShapeTypeFromRequest( 
SfxRequest& rReq )
 return aRet;
 }
 
-/*
-|*
-|* MouseButtonDown-event
-|*
-\/
-
 sal_Bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
 {
 sal_Bool bReturn = SwDrawBase::MouseButtonDown(rMEvt);
@@ -106,23 +94,11 @@ sal_Bool ConstCustomShape::MouseButtonDown(const 
MouseEvent& rMEvt)
 return bReturn;
 }
 
-/*
-|*
-|

[PUSHED] coverity#1019413: Unitialized scalar variable

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3895

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3895
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a2a1a137176f2f2176b2c16cd7a747d9bc9b52
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] coverity#1000721 Resource Leak

[Bosdonnat Cedric (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3897

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3897
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59161a08eee0406ac71b1212a0a8697edf27911f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Bosdonnat Cedric 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice