LibreOffice Gerrit News 2013-06-19

2013-06-19 Thread gerrit 
Moin!

* Open changes on master for project core changed in the last 25 hours:

String.AppendAscii() cleanup in sc 
in https://gerrit.libreoffice.org/4352 from Ricardo Montania
solenv/bin: remove unreferenced obsoleted scripts  
in https://gerrit.libreoffice.org/4239 from Matúš Kukan
fontsizedialog.ui widget   
in https://gerrit.libreoffice.org/4312 from Manal Alhassoun
fdo#43460 unoxml,writerfilter,xmlsecurity: use isEmpty()   
in https://gerrit.libreoffice.org/4349 from Jelle van der Waa
Translate some key names to Hungarian in Customize - Keyboard 
in https://gerrit.libreoffice.org/4346 from Gabor Kelemen
fdo#43460 xmloff: use isEmpty()
in https://gerrit.libreoffice.org/4348 from Jelle van der Waa
Translate German comments, correct some WS 
in https://gerrit.libreoffice.org/4331 from Philipp Weissenbacher
fdo#36791 : fix for import of greeting card
in https://gerrit.libreoffice.org/4240 from Adam CloudOn
fdo#59427 first step for template menu 
in https://gerrit.libreoffice.org/4284 from Cor Nouws
fdo#65541: Proper EPM %requires dependencies, at least for Linux   
in https://gerrit.libreoffice.org/4344 from Stephan Bergmann
rtl: add global empty oustring 
in https://gerrit.libreoffice.org/4264 from Norbert Thiebaud
fdo#60924 autoinstall - gbuild/scp2: still more libs to OOO
in https://gerrit.libreoffice.org/4268 from Marcos Souza


* Merged changes on master for project core changed in the last 25 hours:

fdo#43460 include,registry,svtools,svx,unodevtools: use isEmpty()  
in https://gerrit.libreoffice.org/4335 from Jelle van der Waa
fdo#43460 connectivity,extensions,filter,idl,idlc: use isEmpty()   
in https://gerrit.libreoffice.org/4325 from Jelle van der Waa
fdo#43460 sw: use isEmpty()
in https://gerrit.libreoffice.org/4334 from Jelle van der Waa
fdo#43460 tools: use isEmpty() 
in https://gerrit.libreoffice.org/4333 from Jelle van der Waa
String to OUString (SfxStringItem and related) 
in https://gerrit.libreoffice.org/4280 from Matteo Casalin
fdo#43460: Use isEmpty() instead of getLength() in svgio   
in https://gerrit.libreoffice.org/4340 from Christina Roßmanith
handle missing dep files in concat-deps
in https://gerrit.libreoffice.org/4302 from Björn Michaelsen
Remove commented out code  
in https://gerrit.libreoffice.org/4332 from Philipp Weissenbacher
Small (hopefully non-controversial) changes to the existing branding   
in https://gerrit.libreoffice.org/4308 from Stefan Knorr
Migrate CheckFields unit test to python
in https://gerrit.libreoffice.org/4294 from David Ostrovsky
Reduce the amount of calls of mkdir -p.
in https://gerrit.libreoffice.org/4297 from Jan Holesovsky


* Abandoned changes on master for project core changed in the last 25 hours:

Use OUString and sal_Int32 in GetNonMnemonicString() and GetCtrlTextWidth()
in https://gerrit.libreoffice.org/3160 from Christina Roßmanith


* Open changes needing tweaks, but being untouched for more than a week:
solve fdo#54819
in https://gerrit.libreoffice.org/3583 from Maxime de Roucy
Remove unused icons after cleaning up Math zoom
in https://gerrit.libreoffice.org/4117 from Rodolfo Ribeiro Gomes
fdo#51296 Helptext added for hyperlinks, hlinks behave  as in writer   
in https://gerrit.libreoffice.org/4051 from Akash Shetye
fdo#44216 Prompt if objects from dropped slide should be fixed in aspect ra
in https://gerrit.libreoffice.org/1348 from Rodolfo Ribeiro Gomes
Bigger slide thumbnails in slidesorter.
in https://gerrit.libreoffice.org/4052 from Thorsten Behrens
remove unused code.
in https://gerrit.libreoffice.org/3167 from navin patidar
Change compareTo - == in dbaccess module  
in https://gerrit.libreoffice.org/3957 from Paulo Henrique Cuchi
fdo#55582 writer, calc: insert shapes also when shapes selected
in https://gerrit.libreoffice.org/1524 from Lennard Wasserthal
show formula results of new formulas even if auto calc is disabled 
in https://gerrit.libreoffice.org/3625 from Markus Mohrhard
Modified Insert-File... to

Re: [ANN] gerrit daily digest active, please add yourself to watched projects, gerrit firehose ends 2013-06-17 0000UTC

2013-06-19 Thread Bjoern Michaelsen 
Hi,

On Thu, Jun 13, 2013 at 04:39:01PM +0200, Bjoern Michaelsen wrote:
 so the gerrit firehose will end on Monday 2013-06-17 UTC -- plus/minus a
 bit for me fumbling around with it.

this is done now.

Best,

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

[Libreoffice-commits] core.git: 2 commits - configure.ac

2013-06-19 Thread Luboš Luňák 
 configure.ac |  127 ---
 1 file changed, 69 insertions(+), 58 deletions(-)

New commits:
commit b7e1aeee11d1405babce1855a4bc67d8c9e4ade4
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Jun 19 09:38:38 2013 +0200

use C++11 also with MSVC

MSVC supports (a subset of) C++11 without any special switch, so always
enable support for it and use whatever features are detected by configure
checks

Change-Id: Ic03be5a1aabe7d20cf763bae6d26a7043a51f287

diff --git a/configure.ac b/configure.ac
index 55467f3..3f36bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5596,7 +5596,13 @@ dnl 
===
 
 CXXFLAGS_CXX11=
 HAVE_CXX11=
-if test $GCC = yes; then
+if test $COM = MSC; then
+AC_MSG_CHECKING([whether $CXX supports C++11])
+AC_MSG_RESULT(yes)
+# MSVC supports (a subset of) CXX11 without any switch
+HAVE_CXX11=TRUE
+CXXFLAGS_CXX11=
+elif test $GCC = yes; then
 CXXFLAGS_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++11])
 if test $CPP_LIBRARY = LIBCPP -a $_os = Darwin; then
@@ -5622,11 +5628,12 @@ if test $GCC = yes; then
 AC_MSG_RESULT(no)
 fi
 fi
+fi
 
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_CHECKING([whether using C++11 causes libstdc++ 4.7.0/4.7.1 ABI 
breakage])
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+if test $HAVE_CXX11 = TRUE; then
+AC_MSG_CHECKING([whether using C++11 causes libstdc++ 4.7.0/4.7.1 ABI 
breakage])
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include list
 #if !defined(__GLIBCXX__)
 /* ok */
@@ -5637,19 +5644,19 @@ if test $GCC = yes; then
 #else
 abi broken
 #endif
-]])], [AC_MSG_RESULT(no, ok)],
-[AC_MSG_RESULT(yes, disabling C++11)
- HAVE_CXX11=])
-AC_LANG_POP([C++])
-fi
+]])], [AC_MSG_RESULT(no, ok)],
+[AC_MSG_RESULT(yes, disabling C++11)
+ HAVE_CXX11=])
+AC_LANG_POP([C++])
+fi
 
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 
757])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
-AC_LANG_PUSH([C++])
+if test $HAVE_CXX11 = TRUE; then
+AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include stddef.h
 
 template typename T, size_t S char (sal_n_array_size( T()[S] ))[S];
@@ -5678,61 +5685,60 @@ return !(i != 0  j != 0);
 [ AC_MSG_RESULT(no)
   HAVE_CXX11=
 ])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-fi
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+fi
 
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_CHECKING([whether $CXX supports C++11 without __float128 
compile error])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
-AC_LANG_PUSH([C++])
+if test $HAVE_CXX11 = TRUE; then
+AC_MSG_CHECKING([whether $CXX supports C++11 without __float128 compile 
error])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include vector
 // some Clang fail when compiling against libstdc++ headers with 
-std=gnu++0x
 // (__float128)
 ]])
-],[ AC_MSG_RESULT(yes) ],
-[
-AC_MSG_RESULT(no)
-# The only reason why libstdc++ headers fail with Clang in C++11 
mode is because
-# they use the __float128 type that Clang doesn't know (libstdc++ 
checks whether
-# __float128 is available during its build, but it's usually built 
using GCC,
-# and so c++config.h hardcodes __float128 being supported). As the 
only place
-# where __float128 is actually used is in a template 
specialization,
-# -D__float128=void will avoid the problem there while still 
causing a problem
-# if somebody actually uses the type.
-AC_MSG_CHECKING([whether -D__float128=void workaround helps])
-CXXFLAGS=$CXXFLAGS -D__float128=void
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+],[ AC_MSG_RESULT(yes) ],
+[
+AC_MSG_RESULT(no)
+# The only reason why libstdc++ headers fail with Clang in C++11 mode 
is because
+# they use the __float128 type that Clang doesn't know (libstdc++ 
checks whether
+# __float128 is available during its build, but it's usually built 
using GCC,
+# and so c++config.h hardcodes __float128 being supported). As the 
only place
+# where __float128 is actually used is in a template specialization,
+# -D__float128=void

Re: [Libreoffice] needful function on calc

2013-06-19 Thread Deve 
Something new in this topic?

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

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

2013-06-19 Thread Caolán McNamara 
 helpers/help_hid.lst  |8 
 source/text/smath/01/0502.xhp |   31 ---
 2 files changed, 16 insertions(+), 23 deletions(-)

New commits:
commit d6621f90fda77c1d2232f511f42b3ed0dc38ac68
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 09:20:15 2013 +0100

update help ids for math font size dialog .ui conversion

Change-Id: I8f84f83948d0123c0c0d925da278b2af89235ff2

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6bf3648..2a7e2f7 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3548,7 +3548,6 @@ HID_SMA_EXISTS,63160,
 HID_SMA_EXPX,63135,
 HID_SMA_FACTX,63131,
 HID_SMA_FONTDIALOG,63026,
-HID_SMA_FONTSIZEDIALOG,63027,
 HID_SMA_FONTTYPEDIALOG,63028,
 HID_SMA_FONTXY,63223,
 HID_SMA_FORALL,63161,
@@ -7005,15 +7004,8 @@ starmath_ListBox_RID_FONTTYPEDIALOG_7,1401490951,
 starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865,
 starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975,
 starmath_MenuButton_RID_FONTTYPEDIALOG_1,1401499649,
-starmath_MetricField_RID_FONTSIZEDIALOG_1,1401477633,
-starmath_MetricField_RID_FONTSIZEDIALOG_4,1401477636,
-starmath_MetricField_RID_FONTSIZEDIALOG_5,1401477637,
-starmath_MetricField_RID_FONTSIZEDIALOG_6,1401477638,
-starmath_MetricField_RID_FONTSIZEDIALOG_7,1401477639,
-starmath_MetricField_RID_FONTSIZEDIALOG_8,1401477640,
 starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
-starmath_PushButton_RID_FONTSIZEDIALOG_1,1401475585,
 starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
 starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
diff --git a/source/text/smath/01/0502.xhp 
b/source/text/smath/01/0502.xhp
index 4594b73..6b24578 100644
--- a/source/text/smath/01/0502.xhp
+++ b/source/text/smath/01/0502.xhp
@@ -32,28 +32,29 @@
 bookmark xml-lang=en-US branch=index 
id=bm_id3153816bookmark_valuefont sizes; in $[officename] 
Math/bookmark_value
 bookmark_valuesizes; of fonts in $[officename] Math/bookmark_value
 /bookmark
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/fontsizedialog/FontSizeDialog id=bm_id3148867 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:ChangeFontSize id=bm_id3148866 
localize=false/paragraph role=heading id=hd_id3153816 xml-lang=en-US 
level=1 l10n=U oldref=1Font Sizes/paragraph
-paragraph role=paragraph id=par_id3150213 xml-lang=en-US l10n=U 
oldref=2variable id=schriftgroessentextahelp hid=SID_FONTSIZEUse 
this dialog to specify the font sizes for your formula. Select a base size and 
all elements of the formula will be scaled in relation to this base./ahelp
+paragraph role=paragraph id=par_id3150213 xml-lang=en-US l10n=U 
oldref=2variable id=schriftgroessentextahelp 
hid=modules/smath/ui/fontsizedialog/FontSizeDialogUse this dialog to specify 
the font sizes for your formula. Select a base size and all elements of the 
formula will be scaled in relation to this base./ahelp
 /variable/paragraph
 section id=howtoget
   embed href=text/smath/00/0004.xhp#fmtsgr/
 /section
-bookmark xml-lang=en-US 
branch=hid/starmath:MetricField:RID_FONTSIZEDIALOG:1 id=bm_id3149873 
localize=false/paragraph role=heading id=hd_id3146968 xml-lang=en-US 
level=2 l10n=U oldref=3Base size/paragraph
-paragraph role=paragraph id=par_id3145115 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1All elements 
of a formula are proportionally scaled to the base size. To change the base 
size, select or type in the desired point (pt) size. You can also use other 
units of measure or other link href=text/shared/00/0001.xhp#metrik 
name=metricsmetrics/link, which are then automatically converted to 
points./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/fontsizedialog/spinB_baseSize id=bm_id3149873 
localize=false/paragraph role=heading id=hd_id3146968 xml-lang=en-US 
level=2 l10n=U oldref=3Base size/paragraph
+paragraph role=paragraph id=par_id3145115 xml-lang=en-US l10n=CHG 
oldref=4ahelp hid=modules/smath/ui/fontsizedialog/spinB_baseSizeAll 
elements of a formula are proportionally scaled to the base size. To change the 
base size, select or type in the desired point (pt) size. You can also use 
other units of measure or other link href=text/shared/00/0001.xhp#metrik 
name=metricsmetrics/link, which are then automatically converted to 
points./ahelp/paragraph
 paragraph role=tip id=par_id3153005 xml-lang=en-US l10n=CHG 
oldref=19To permanently change the default size (12 pt) used in 
$[officename] Math, you must first set the size (for example, 11 pt) and then 
click the emphDefault/emph button./paragraph
 paragraph role=heading id=hd_id3153735 xml-lang=en-US level=2 
l10n=U oldref=5Relative Sizes/paragraph
 paragraph role=paragraph id=par_id3145241 xml-lang=en-US l10n=U 
oldref=6In this section, you can determine the relative sizes for each type 
of element with

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sw/qa writerfilter/source

2013-06-19 Thread Miklos Vajna 
 sw/qa/extras/rtfimport/data/n825305.rtf |   76 
 sw/qa/extras/rtfimport/rtfimport.cxx|   14 +
 writerfilter/source/rtftok/rtfsdrimport.cxx |5 +
 3 files changed, 95 insertions(+)

New commits:
commit 073fadca38eba2960c89db07713c0d0d430e2874
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jun 18 16:22:32 2013 +0200

bnc#825305 RTF import of fFilled shape property

Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0
(cherry picked from commit 2af60e2eff4e952fff8cac0228b89f16ce3a436e)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx

diff --git a/sw/qa/extras/rtfimport/data/n825305.rtf 
b/sw/qa/extras/rtfimport/data/n825305.rtf
new file mode 100755
index 000..72a6b52
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n825305.rtf
@@ -0,0 +1,76 @@
+{\rtf 
+\viewkind1\margl360\margr360
+\margt360\margb360\paperw12240\paperh15840\pard
+{\shp 
+{\*\shpinst\shpleft555\shpright1185\shptop5715\shpbottom5970\shpbxpage
+\shpbypage\shpwr3\shpz1 
+{\sp 
+{\sn shapeType}
+{\sv 1}
+}
+{\sp 
+{\sn fLine}
+{\sv 1}
+}
+{\sp
+ 
+{\sn lineWidth}
+{\sv 0}
+}
+{\sp 
+{\sn lineColor}
+{\sv 10485760}
+}
+{\sp 
+{\sn lineDashing
+}
+{\sv 0}
+}
+{\sp 
+{\sn fFilled}
+{\sv 1}
+}
+{\sp 
+{\sn fillColor}
+{\sv 10485760}
+}
+}
+}
+{\shp 
+{\*\shpinst\shpleft780\shpright1425\shptop5790\shpbottom6030\shpbxpage
+\shpbypage\shpwr3\shpz2 
+{\sp 
+{\sn shapeType}
+{\sv 202}
+}
+{\sp 
+{\sn dxTextLeft}
+{\sv 
+0}
+}
+{\sp 
+{\sn dxTextRight}
+{\sv 0}
+}
+{\sp 
+{\sn dyTextTop}
+{\sv 0}
+}
+{\sp 
+{\sn 
+dyTextBottom}
+{\sv 0}
+}
+{\sp 
+{\sn fLine}
+{\sv 0}
+}
+{\shptxt\plain\pard\f29\fs20 Ln #
+\par}
+{\sp 
+{\sn fFilled}
+{\sv 0}
+}
+}
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3a41731..c87ba3e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -149,6 +149,7 @@ public:
 void testFdo63023();
 void testN818997();
 void testFdo64671();
+void testN825305();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -268,6 +269,7 @@ void Test::run()
 {fdo63023.rtf, Test::testFdo63023},
 {n818997.rtf, Test::testN818997},
 {fdo64671.rtf, Test::testFdo64671},
+{n825305.rtf, Test::testN825305},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1230,6 +1232,18 @@ void Test::testFdo64671()
 getRun(getParagraph(1), 1, OUString(\xC5\xBD, 2, RTL_TEXTENCODING_UTF8));
 }
 
+void Test::testN825305()
+{
+// The problem was that the textbox wasn't transparent, due to 
unimplemented fFilled == 0.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertyState 
xPropertyState(xDraws-getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(100), 
getPropertysal_Int32(xDraws-getByIndex(1), FillTransparence));
+beans::PropertyState ePropertyState = 
xPropertyState-getPropertyState(FillTransparence);
+// Was beans::PropertyState_DEFAULT_VALUE.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, ePropertyState);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 864a8bd..3bb7af9 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -104,6 +104,7 @@ void RTFSdrImport::resolve(RTFShape rShape)
 uno::Any aLineColor = uno::makeAny(COL_BLACK);
 // Default line width is 0.75 pt (26 mm100) in Word, 0 in Writer.
 uno::Any aLineWidth = uno::makeAny(sal_Int32(26));
+bool bFilled = true;
 
 for (std::vector std::pairrtl::OUString, rtl::OUString ::iterator i = 
rShape.aProperties.begin();
 i != rShape.aProperties.end(); ++i)
@@ -288,6 +289,8 @@ void RTFSdrImport::resolve(RTFShape rShape)
 aViewBox.Height = i-second.toInt32();
 else if ( i-first == dhgt )
 resolveDhgt(xPropertySet, i-second.toInt32());
+else if (i-first == fFilled)
+bFilled = i-second.toInt32() == 1;
 else
 SAL_INFO(writerfilter, OSL_THIS_FUNC  : TODO handle shape 
property ' 
 OUStringToOString( i-first, RTL_TEXTENCODING_UTF8 
).getStr()  ':' 
@@ -357,6 +360,8 @@ void RTFSdrImport::resolve(RTFShape rShape)
 xPropertySet-setPropertyValue(VertOrientRelation, 
uno::makeAny(rShape.nVertOrientRelation));
 if (rShape.nWrap != -1)
 xPropertySet-setPropertyValue(Surround, 
uno::makeAny(text::WrapTextMode(rShape.nWrap)));
+if (!bFilled)
+xPropertySet-setPropertyValue(FillTransparence, 
uno::makeAny(sal_Int32(100)));
 }

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

2013-06-19 Thread Caolán McNamara 
 14/4eb666b72516ef78c15424087800dff1be5cfd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 178520155e80d62735d7e3515781d568440f4af3
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 09:24:17 2013 +0100

Notes added by 'git notes add'

diff --git a/14/4eb666b72516ef78c15424087800dff1be5cfd 
b/14/4eb666b72516ef78c15424087800dff1be5cfd
new file mode 100644
index 000..31dd927
--- /dev/null
+++ b/14/4eb666b72516ef78c15424087800dff1be5cfd
@@ -0,0 +1 @@
+merged as: 02da9f7a917ffc68dfe7a44c8d03b272cb5bfc18
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx vcl/win

2013-06-19 Thread Gabor Kelemen 
 vcl/unx/generic/app/keysymnames.cxx |   13 +
 vcl/win/source/window/keynames.cxx  |   11 +++
 2 files changed, 24 insertions(+)

New commits:
commit 0b9bf62d3ddfe3fd1ed9ec4cc8eddf23793ee932
Author: Gabor Kelemen kelem...@ubuntu.com
Date:   Tue Jun 18 17:58:04 2013 +0200

Translate some key names to Hungarian in Customize - Keyboard

Change-Id: If11b5fbd96a107ed83e305127713630093ef00dc
Reviewed-on: https://gerrit.libreoffice.org/4346
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
index 6356c61..5d0958a 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -442,6 +442,18 @@ namespace vcl_sal {
 { SunXK_Cut,   IÅ¡kirpti },
 };
 
+static const struct KeysymNameReplacement aImplReplacements_Hungarian[] =
+{
+{ XK_Right, Jobbra },
+{ XK_Left, Balra },
+{ XK_Up, Fel },
+{ XK_Down, Le },
+{ XK_Return, Enter },
+{ XK_space, Szóköz },
+{ XK_asterisk, Csillag },
+{ XK_slash, Osztásjel },
+};
+
 static const struct KeyboardReplacements aKeyboards[] =
 {
 { ca, aImplReplacements_Catalan, 
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
@@ -450,6 +462,7 @@ namespace vcl_sal {
 { es, aImplReplacements_Spanish, 
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
 { et, aImplReplacements_Estonian, 
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
 { fr, aImplReplacements_French, 
SAL_N_ELEMENTS(aImplReplacements_French) },
+{ hu, aImplReplacements_Hungarian, 
SAL_N_ELEMENTS(aImplReplacements_Hungarian) },
 { it, aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
 { lt, aImplReplacements_Lithuanian, 
SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
 { nl, aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index fcac7d6..c85360a 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -175,11 +175,22 @@ namespace vcl_sal {
 { PAPUGA_KEY_SHIFT, Mayús },
 };
 
+static const struct KeysNameReplacement aImplReplacements_Hungarian[] =
+{
+{ PAPUGA_KEY_RIGHT, Jobbra },
+{ PAPUGA_KEY_LEFT, Balra },
+{ PAPUGA_KEY_UP, Fel },
+{ PAPUGA_KEY_DOWN, Le },
+{ PAPUGA_KEY_ENTER, Enter },
+{ PAPUGA_KEY_SPACEBAR, Szóköz },
+};
+
 static const struct KeyboardReplacements aKeyboards[] =
 {
 { ast,aImplReplacements_Asturian, 
SAL_N_ELEMENTS(aImplReplacements_Asturian) },
 { ca, aImplReplacements_Catalan, 
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
 { et, aImplReplacements_Estonian, 
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
+{ hu, aImplReplacements_Hungarian, 
SAL_N_ELEMENTS(aImplReplacements_Hungarian) },
 { lt, aImplReplacements_Lithuanian, 
SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
 { sl, aImplReplacements_Slovenian, 
SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
 { es, aImplReplacements_Spanish, 
SAL_N_ELEMENTS(aImplReplacements_Spanish) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - writerfilter/source

2013-06-19 Thread Cédric Bosdonnat 
 writerfilter/source/dmapper/GraphicImport.cxx  |3 +--
 writerfilter/source/dmapper/WrapPolygonHandler.cxx |8 
 writerfilter/source/dmapper/WrapPolygonHandler.hxx |2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit ae6981601b0e9175efaf9849b1279290ea3380f6
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jun 19 10:42:47 2013 +0200

n#820800: docx import of wrap polyon was based on dest size of picture

... instead of the original size of it.

Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index ed1800a..1e3cb11 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1530,8 +1530,7 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 if( aGraphicSize.Width  aGraphicSize.Height 
 m_pImpl-mpWrapPolygon.get() != NULL)
 {
-awt::Size aDstSize(m_pImpl-getXSize(), 
m_pImpl-getYSize());
-WrapPolygon::Pointer_t pCorrected = 
m_pImpl-mpWrapPolygon-correctWordWrapPolygon(aGraphicSize, aDstSize);
+WrapPolygon::Pointer_t pCorrected = 
m_pImpl-mpWrapPolygon-correctWordWrapPolygon(aGraphicSize);
 aContourPolyPolygon = 
pCorrected-getPointSequenceSequence();
 }
 
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx 
b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 885925d..134c49c 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -104,7 +104,7 @@ WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction  
rFractionX, const Fra
 return pResult;
 }
 
-WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size  
rSrcSize, const awt::Size  rDstSize)
+WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size  
rSrcSize)
 {
 WrapPolygon::Pointer_t pResult;
 
@@ -119,9 +119,9 @@ WrapPolygon::Pointer_t 
WrapPolygon::correctWordWrapPolygon(const awt::Size  rSr
 Fraction aScaleY(nWrap100Percent, Fraction(nWrap100Percent) - aMove);
 pResult = pResult-scale(aScaleX, aScaleY);
 
-Fraction aScaleDestX(rDstSize.Width, nWrap100Percent);
-Fraction aScaleDestY(rDstSize.Height, nWrap100Percent);
-pResult = pResult-scale(aScaleDestX, aScaleDestY);
+Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent);
+Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent);
+pResult = pResult-scale(aScaleSrcX, aScaleSrcY);
 
 return pResult;
 }
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx 
b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 9312db7..52cdf5e 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -55,7 +55,7 @@ public:
 
 WrapPolygon::Pointer_t move(const awt::Point  rMove);
 WrapPolygon::Pointer_t scale(const Fraction  rFractionX, const Fraction  
rFractionY);
-WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size  rSrcSize, 
const awt::Size  rDstSize);
+WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size  rSrcSize);
 drawing::PointSequenceSequence getPointSequenceSequence() const;
 };
 
___
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' - d3/2f1d358dcd2574d8ae6cd19da01b7311ef5926

2013-06-19 Thread Caolán McNamara 
 d3/2f1d358dcd2574d8ae6cd19da01b7311ef5926 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 01ec2ac9bfc6be44b22c611b469422fed4563e4b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 10:10:22 2013 +0100

Notes added by 'git notes add'

diff --git a/d3/2f1d358dcd2574d8ae6cd19da01b7311ef5926 
b/d3/2f1d358dcd2574d8ae6cd19da01b7311ef5926
new file mode 100644
index 000..8d5d64d
--- /dev/null
+++ b/d3/2f1d358dcd2574d8ae6cd19da01b7311ef5926
@@ -0,0 +1 @@
+merged as: 5c346ec8521b0f137273e5055fc19eee37a20169
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Armin Le Grand 
 include/svx/galtheme.hxx |   12 +
 svx/inc/galobj.hxx   |3 
 svx/source/gallery2/galctrl.cxx  |  410 +++
 svx/source/gallery2/galobj.cxx   |   48 
 svx/source/gallery2/galtheme.cxx |   50 
 5 files changed, 391 insertions(+), 132 deletions(-)

New commits:
commit 5c346ec8521b0f137273e5055fc19eee37a20169
Author: Armin Le Grand a...@apache.org
Date:   Tue May 7 13:53:03 2013 +

Resolves: #i122231# Buffered content for gallery themes

better graphical preparation (currently BMP_SCALE_BESTQUALITY, but can
be changed in a single place now if wanted)

(cherry picked from commit d32f1d358dcd2574d8ae6cd19da01b7311ef5926)

Conflicts:
svx/inc/svx/galtheme.hxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galtheme.cxx

Change-Id: I80879ca472c784f764126676046c1388e1167652

diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 8eccc86..25f939a 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -45,7 +45,13 @@ struct GalleryObject
 INetURLObject   aURL;
 sal_uInt32  nOffset;
 SgaObjKind  eObjKind;
-sal_BoolbDummy;
+boolmbDelete;
+
+//UI visualization buffering
+BitmapExmaPreviewBitmapEx;
+SizemaPreparedSize;
+String  maTitle;
+String  maPath;
 };
 
 typedef ::std::vector GalleryObject*  GalleryObjectList;
@@ -219,6 +225,10 @@ public:
 SvStream   WriteData( SvStream rOut ) const;
 SvStream   ReadData( SvStream rIn );
 static SVX_DLLPUBLIC void   InsertAllThemes( ListBox rListBox );
+
+// for buffering PreviewBitmaps and strings for object and path
+void GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx rBitmapEx, 
Size rSize, String rTitle, String rPath) const;
+void SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx 
rBitmapEx, const Size rSize, const String rTitle, const String rPath);
 };
 
 SvStream operator( SvStream rOut, const GalleryTheme rTheme );
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 09e0382..8712b71 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -71,7 +71,6 @@ protected:
 sal_BoolCreateThumb( const Graphic rGraphic );
 
 public:
-
 SgaObject();
 virtual ~SgaObject() {};
 
@@ -89,6 +88,8 @@ public:
 
 friend SvStreamoperator( SvStream rOut, const SgaObject rObj 
);
 friend SvStreamoperator( SvStream rIn, SgaObject rObj );
+
+BitmapEx createPreviewBitmapEx(const Size rSizePixel) const;
 };
 
 class SgaObjectSound : public SgaObject
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 2aacbaa..3e08539 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -325,82 +325,158 @@ void GalleryIconView::UserDraw( const UserDrawEvent 
rUDEvt )
 
 if( nId  mpTheme )
 {
-SgaObject* pObj = mpTheme-AcquireObject( nId - 1 );
+const Rectangle rRect = rUDEvt.GetRect();
+const Size aSize(rRect.GetWidth(), rRect.GetHeight());
+BitmapEx aBitmapEx;
+Size aPreparedSize;
+String aItemTextTitle;
+String aItemTextPath;
 
-if( pObj )
-{
-const RectanglerRect = rUDEvt.GetRect();
-OutputDevice*   pDev = rUDEvt.GetDevice();
-Graphic aGraphic;
-bool bTransparent(false);
+mpTheme-GetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, 
aPreparedSize, aItemTextTitle, aItemTextPath);
 
-if( pObj-IsThumbBitmap() )
-{
-BitmapEx aBitmapEx;
+bool bNeedToCreate(aBitmapEx.IsEmpty());
 
-if( pObj-GetObjKind() == SGA_OBJ_SOUND )
-{
-Bitmap aTemp = pObj-GetThumbBmp().GetBitmap();
+if(!bNeedToCreate  !aItemTextTitle.Len())
+{
+bNeedToCreate = true;
+}
 
-aTemp.Replace( COL_LIGHTMAGENTA, COL_WHITE );
-aBitmapEx = BitmapEx(aTemp);
-}
-else
-{
-aBitmapEx = pObj-GetThumbBmp();
-bTransparent = aBitmapEx.IsTransparent();
-}
+if(!bNeedToCreate  aPreparedSize != aSize)
+{
+bNeedToCreate = true;
+}
 
-if( ( pDev-GetBitCount() = 8 )  ( aBitmapEx.GetBitCount() 
= 8 ) )
-{
-aBitmapEx.Dither( BMP_DITHER_FLOYD );
-}
+if(bNeedToCreate)
+{
+SgaObject* pObj = mpTheme-AcquireObject(nId - 1);
 
-aGraphic = aBitmapEx;
-}
-else
+if(pObj)
 {
-aGraphic = pObj-GetThumbMtf();
-

Re: SVG: scaling if no width/height is given

2013-06-19 Thread Thorsten Behrens 
Christina Roßmanith wrote:
 the problem described here -
 https://bugs.freedesktop.org/show_bug.cgi?id=64125 is caused by a
 missing width and height attribute of the SVG given as an example.
 So, what would we expect given a ViewBox attribute when importing a
 graphic?
 
 What I'd expect is that the aspect ratio is kept and a reasonable
 scaling is applied in order to fill a page, table cell or whatever.
 And that the little green squares (handles?) behave like a bounding
 box for the graphic content. Is that correct?
 
Hi Christina,

hmm - since there is no viewport given, I'd assume svg takes the whole
surrounding space, i.e. the draw page in this case. The ViewBox would
then be relative to that user coordinate system, scaling the content
to fill it. Since there is no preserveAspectRatio given, I read the
spec that then the default of xMidYMid is taken, so indeed scaling
should be uniformely. Does that match your reading?

That would be using:
 - http://www.w3.org/TR/SVG/coords.html#ViewportSpace
 - http://www.w3.org/TR/SVG/coords.html#EstablishingANewViewport
 - http://www.w3.org/TR/SVG/coords.html#ViewBoxAttribute
 - http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute

 What I've achieved so far is the correct scaling. What I'm looking
 for is where the total size of the graphic is still determined wrong
 (see attached screenshot) - little green squares are more like DIN
 A4 than the ViewBox size.
 
Can you submit the patch (gerrit preferred, you can give yourself a -1
review to prevent Fridrich from merging it straight away ;)), would
need to look into that a bit. :)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries helpcontent2 translations

2013-06-19 Thread Fridrich Štrba 
 dictionaries |2 +-
 helpcontent2 |2 +-
 translations |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3a85ec9f903cb5f10c6bbe2a9dcd119461813098
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jun 19 11:35:14 2013 +0200

Bringing back the submodules to the branch

Change-Id: Id279ed3f73e3368d1cda0ea11a3ff06f4ddb6dda

diff --git a/dictionaries b/dictionaries
index acaca7f..9ec57a8 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit acaca7f442d69ae360ee013bed7c180ceb158479
+Subproject commit 9ec57a8df294f82d2b038ada757e3924406d7719
diff --git a/helpcontent2 b/helpcontent2
index 2b4d8e8..e15ec69 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2b4d8e83bd2e59ae70e0bf80eb00a20be452a39a
+Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
diff --git a/translations b/translations
index 46c683c..9b5110f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 46c683c740acf324164f188a97abea28fe3c1bf9
+Subproject commit 9b5110fd0c47fb475a83ae33b286bdcff2652784
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Philipp Weissenbacher 
 svl/source/numbers/numfmuno.cxx |   59 ++
 svl/source/numbers/zforscan.cxx |  391 +++-
 2 files changed, 215 insertions(+), 235 deletions(-)

New commits:
commit 0d5a2d2284addd5d161ca7bb30a354d268c2600a
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Tue Jun 18 11:33:49 2013 +0200

Translate German comments, correct some WS

Added accidentally removed {

Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
Reviewed-on: https://gerrit.libreoffice.org/4331
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 40f34e9..826d53d 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -34,15 +34,11 @@
 
 using namespace com::sun::star;
 
-//
-
 #define SERVICENAME_NUMBERFORMATTER com.sun.star.util.NumberFormatter
 #define SERVICENAME_NUMBERSETTINGS  com.sun.star.util.NumberFormatSettings
 #define SERVICENAME_NUMBERFORMATS   com.sun.star.util.NumberFormats
 #define SERVICENAME_NUMBERFORMATcom.sun.star.util.NumberFormatProperties
 
-//
-
 #define PROPERTYNAME_FMTSTR FormatString
 #define PROPERTYNAME_LOCALE Locale
 #define PROPERTYNAME_TYPE   Type
@@ -62,9 +58,7 @@ using namespace com::sun::star;
 #define PROPERTYNAME_STDDEC StandardDecimals
 #define PROPERTYNAME_TWODIGIT   TwoDigitDateStart
 
-//
-
-//  alles ohne Which-ID, Map nur fuer PropertySetInfo
+// All without a Which-ID, Map only for PropertySetInfo
 
 static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
 {
@@ -101,8 +95,6 @@ static const SfxItemPropertyMapEntry* 
lcl_GetNumberSettingsPropertyMap()
 return aNumberSettingsPropertyMap_Impl;
 }
 
-//
-
 static LanguageType lcl_GetLanguage( const lang::Locale rLocale )
 {
 //  empty language - LANGUAGE_SYSTEM
@@ -111,13 +103,11 @@ static LanguageType lcl_GetLanguage( const lang::Locale 
rLocale )
 
 LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false );
 if ( eRet == LANGUAGE_NONE )
-eRet = LANGUAGE_SYSTEM; //! or throw an exception?
+eRet = LANGUAGE_SYSTEM; //! or throw an exception?
 
 return eRet;
 }
 
-//
-
 SvNumberFormatterServiceObj::SvNumberFormatterServiceObj()
 :m_aMutex()
 {
@@ -145,7 +135,7 @@ void SAL_CALL 
SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const un
 
 SvNumberFormatsSupplierObj* pNew = 
SvNumberFormatsSupplierObj::getImplementation( _xSupplier );
 if (!pNew)
-throw uno::RuntimeException();  // wrong object
+throw uno::RuntimeException(); // wrong object
 
 xAutoReleaseOld = xSupplier;
 
@@ -231,7 +221,7 @@ util::Color SAL_CALL 
SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier-GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -240,7 +230,7 @@ util::Color SAL_CALL 
SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
 pFormatter-GetOutputString(fValue, nKey, aStr, pColor);
 if (pColor)
 nRet = pColor-GetColor();
-// sonst Default behalten
+// Else keep Default
 }
 else
 throw uno::RuntimeException();
@@ -276,7 +266,7 @@ util::Color SAL_CALL 
SvNumberFormatterServiceObj::queryColorForString( sal_Int32
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier-GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -288,7 +278,7 @@ util::Color SAL_CALL 
SvNumberFormatterServiceObj::queryColorForString( sal_Int32
 {
 nRet = pColor-GetColor();
 }
-// sonst Default behalten
+// Else keep Default
 }
 else
 {
@@ -354,7 +344,7 @@ util::Color SAL_CALL 
SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-util::Color nRet = aDefaultColor;   // color = sal_Int32
+util::Color nRet = aDefaultColor; // color = sal_Int32
 SvNumberFormatter* pFormatter = xSupplier.is() ? 
xSupplier-GetNumberFormatter() : NULL;
 if (pFormatter)
 {
@@ -372,7 +362,7 @@ util::Color SAL_CALL

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

2013-06-19 Thread Jelle van der Waa 
 xmloff/source/chart/PropertyMaps.cxx  |2 +-
 xmloff/source/core/unoatrcn.cxx   |2 +-
 xmloff/source/draw/animationexport.cxx|   10 +-
 xmloff/source/draw/shapeexport4.cxx   |4 ++--
 xmloff/source/draw/xexptran.cxx   |2 +-
 xmloff/source/meta/xmlmetai.cxx   |2 +-
 xmloff/source/style/XMLBackgroundImageExport.cxx  |6 +++---
 xmloff/source/style/fonthdl.cxx   |2 +-
 xmloff/source/style/xmlnume.cxx   |2 +-
 xmloff/source/style/xmlnumfe.cxx  |4 ++--
 xmloff/source/style/xmlnumfi.cxx  |   11 +--
 xmloff/source/text/XMLLineNumberingExport.cxx |2 +-
 xmloff/source/text/XMLSectionFootnoteConfigExport.cxx |2 +-
 xmloff/source/text/txtflde.cxx|2 +-
 xmloff/source/text/txtftne.cxx|2 +-
 15 files changed, 27 insertions(+), 28 deletions(-)

New commits:
commit ad09b2f7efac628ac4261b86f9fd085f83ebe717
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Tue Jun 18 19:53:19 2013 +0200

fdo#43460 xmloff: use isEmpty()

Change-Id: I298767cc0ec03c22d3ae687939f0f9d5ce1963c1
Reviewed-on: https://gerrit.libreoffice.org/4348
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/xmloff/source/chart/PropertyMaps.cxx 
b/xmloff/source/chart/PropertyMaps.cxx
index 9962a09d..1f8bd78 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -471,7 +471,7 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
 break;
 }
 
-if( sValueBuffer.getLength())
+if( !sValueBuffer.isEmpty())
 {
 sValue = sValueBuffer.makeStringAndClear();
 sAttrName = rNamespaceMap.GetQNameByKey( nNameSpace, sAttrName );
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index cc51124..f479ba5 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -143,7 +143,7 @@ uno::Sequence OUString  SAL_CALL 
SvUnoAttributeContainer::getElementNames(void
 for( sal_uInt16 nAttr = 0; nAttr  nAttrCount; nAttr++ )
 {
 OUStringBuffer sBuffer( mpContainer-GetAttrPrefix(nAttr) );
-if( sBuffer.getLength() != 0L )
+if( !sBuffer.isEmpty() )
 sBuffer.append( (sal_Unicode)':' );
 sBuffer.append( mpContainer-GetAttrLName(nAttr) );
 *pNames++ = sBuffer.makeStringAndClear();
diff --git a/xmloff/source/draw/animationexport.cxx 
b/xmloff/source/draw/animationexport.cxx
index f3ba964..fd31cca 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1200,7 +1200,7 @@ void AnimationsExporterImpl::exportAnimate( const 
Reference XAnimate  xAnimat
 
 while( nLength-- )
 {
-if( sTmp.getLength() )
+if( !sTmp.isEmpty() )
 sTmp.append( (sal_Unicode)';' );
 
 sTmp.append( *p++ );
@@ -1244,7 +1244,7 @@ void AnimationsExporterImpl::exportAnimate( const 
Reference XAnimate  xAnimat
 
 while( nLength-- )
 {
-if( sTmp.getLength() )
+if( !sTmp.isEmpty() )
 sTmp.append( (sal_Unicode)';' );
 
 sTmp.append( p-Time );
@@ -1475,7 +1475,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum 
eAttributeName, OUString
 
 for( nElement = 0; nElement  nLength; nElement++, pAny++ )
 {
-if( sTmp.getLength() )
+if( !sTmp.isEmpty() )
 sTmp.append( (sal_Unicode)';' );
 convertValue( eAttributeName, sTmp2, *pAny );
 sTmp.append( sTmp2.makeStringAndClear() );
@@ -1557,7 +1557,7 @@ void AnimationsExporterImpl::convertTiming( 
OUStringBuffer sTmp, const Any rVa
 
 for( nElement = 0; nElement  nLength; nElement++, pAny++ )
 {
-if( sTmp.getLength() )
+if( !sTmp.isEmpty() )
 sTmp.append( (sal_Unicode)';' );
 convertTiming( sTmp2, *pAny );
 sTmp.append( sTmp2.makeStringAndClear() );
@@ -1596,7 +1596,7 @@ void AnimationsExporterImpl::convertTiming( 
OUStringBuffer sTmp, const Any rVa
 {
 convertTiming( sTmp2, pEvent-Offset );
 
-if( sTmp.getLength() )
+if( !sTmp.isEmpty() )
 sTmp.append( (sal_Unicode)'+' );
 
 sTmp.append( sTmp2.makeStringAndClear() );
diff --git a/xmloff/source/draw/shapeexport4.cxx 
b/xmloff/source/draw/shapeexport4.cxx
index ad34554..b83f73e 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -78,7 +78,7 @@ using ::com::sun::star::uno::Sequence;
 
 void

[Libreoffice-commits] core.git: unoxml/source writerfilter/source xmlsecurity/source

2013-06-19 Thread Jelle van der Waa 
 unoxml/source/dom/element.cxx  |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +++---
 xmlsecurity/source/dialogs/resourcemanager.cxx |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b5f3f55ce59b400f885c41413a3087e3406a424d
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Tue Jun 18 20:02:13 2013 +0200

fdo#43460 unoxml,writerfilter,xmlsecurity: use isEmpty()

Change-Id: Iba3b39086212803bc41384f5c8f51e42712a5249
Reviewed-on: https://gerrit.libreoffice.org/4349
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 50bb0bd..87dba8a 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -502,7 +502,7 @@ namespace DOM
 Reference XAttr  aAttr;
 if (!oldAttr-getNamespaceURI().isEmpty()) {
 OUStringBuffer qname(oldAttr-getPrefix());
-if (0 != qname.getLength()) {
+if (!qname.isEmpty()) {
 qname.append(sal_Unicode(':'));
 }
 qname.append(oldAttr-getName());
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8bd05dc..8849ed7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1237,7 +1237,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 aBuf.append(ch);
 else if (bInKeyword  isspace(ch))
 bInKeyword = false;
-if (aBuf.getLength()  0  !isalnum(ch))
+if (!aBuf.isEmpty()  !isalnum(ch))
 bFoundCode = true;
 }
 Strm().Seek(nPos);
@@ -4649,12 +4649,12 @@ void RTFDocumentImpl::setSkipUnknown(bool bSkipUnknown)
 
 void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
 {
-if (bUnicode  m_aUnicodeBuffer.getLength()  0)
+if (bUnicode  !m_aUnicodeBuffer.isEmpty())
 {
 OUString aString = m_aUnicodeBuffer.makeStringAndClear();
 text(aString);
 }
-if (bHex  m_aHexBuffer.getLength()  0)
+if (bHex  !m_aHexBuffer.isEmpty())
 {
 OUString aString = 
OStringToOUString(m_aHexBuffer.makeStringAndClear(), 
m_aStates.top().nCurrentEncoding);
 text(aString);
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx 
b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2611960..d9279b1 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -284,7 +284,7 @@ vector pair OUString, OUString  parseDN(const OUString 
rRawString)
 }
 }
 }
-if (sbufValue.getLength())
+if (!sbufValue.isEmpty())
 {
 OSL_ASSERT(!sType.isEmpty());
 retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix1'

2013-06-19 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.0.1-buildfix1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-19 11:14 -0700

Tag libreoffice-4.1.0.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwYR0AAoJEPQ0oe+v7q6jUJkQAKb+jTevJ2UHvoWqUfz9wEHp
zPQN5p3d/Kv2VNi4KerO0hsC/eLtEGO2BxeGoK507VZC8P5JoltbjXr0eUl8NHoP
Na0MvClp/oJNurGJ/slC4r9IAJuZMOMsOtgyVwoiPYxjGRPvSCkuZriVP+MB4CGw
fXzlUllWHs4yuruLuRh9isrWLYMdO4UoQ1EDesTsgfoeR4GhM694o6Teyz8fLzLN
IBpjnPQzv+I2pR73rzWAUO04v6xcB9AVftX00kSRKm2XUR0+X6QdXIxW1D+erB7v
41CTe9pKXkuwW1nRs5mbSeZ4yO33VR7jErWt7eXpt6mgqq3ZjQY/KLxfHpZhSVZm
LtaL+o93OqYBmblP+XMpoK29nWUsDsTsy6BO6/UxBDYg4BRu0AXxyfNYUCdYJkFm
lX7EYh3Bk4iZcwF99OOIwQJythrTrxXlNTHibWeSkobMD9ZbNW9/qCIZqFTXsut9
tSkezKqTabJHOCvPewzxPjzU7q8GD4Nr6dPqof3ajLxypTBbIOMUdjxLC3uiIyis
PtwckqWNRcaHkraHAEQ9xYtVw2G/VK7P0dIaL/cnyqJ2ITNidd8ejxAFeu6y0sKf
vkZuaYmJfmPmm0I3DP9+kPrbFzLPSbVLU24LBypCZjYJ71tYN5FcKttrbxlr9EYX
ma6Q7hR5at1tRWnsWC5a
=tSE/
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-12:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix1'

2013-06-19 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.0.1-buildfix1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-19 11:14 -0700

Tag libreoffice-4.1.0.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwYR8AAoJEPQ0oe+v7q6jjKoP/j4HTllQF9Hk54nIZFrxRt3l
XKXS0b4/tpPE/Xk05SOvkXJXWMRBCMxjsjqCt5QdfJyF2Y/hpzkyAzY88m2ngiSN
UmTzxKObEXQgTFiqxFyIiJZOQjJH95wMSP4+nIP6eJVkNpWnwStzGpqW2WePT52x
Hq6qrh6aJfuUupdxiA5rv9fvfDKwN/S/ozHgU4EgZSZA07ebOgSRmpkrkD/asdPE
/52R/AUqfme1mw/V9N9Urahzo8oZPv/tfXXTQSZ2O+/iC6oVm28swkAe9zez0AUI
Q7pbwUYipc/sTmDV9nu4eoxcptfqzpU8h8O2ZRGApBeo/vCQvDLix1dNhAzBO5vJ
mZT+YDtaPFLE+s9VtzvEHRbcUQ4coGP0rPQaqNhMLRoNWgpeTYd7fVlQe8G2zLfi
Wy53ok3zKafM6Jpu2XHpNYPwJHGu3np4wnSRRGGZzJ5z7nQ1yAmxjV3Sos4LziHs
WoXkpNxjWpgWKhN4Q8mGDeS55yLes/KphrTIXeNblenCNTUxSFBkaKuOnrznsnfr
sp3BOj0bhMjqMKLVCYBtBXt6T9IH7RxFGcveDeE5csG9qkodLQMnh3+FHr3iAryn
BK21Y0xT7Q+WminFDJ5LHay8SCBE8QDSKVcbRSrVHuv7mub4l41OTAxSjXjelaAh
tuGv45GUnGzuo+V/Sn+z
=EEp4
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.1:
Christian Lohmaier (1):
  4.1.0.1.buildfix1 - Kazakh translation had bad quoting

---
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix1'

2013-06-19 Thread Andras Timar 
Tag 'libreoffice-4.1.0.1-buildfix1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-19 11:14 -0700

Tag libreoffice-4.1.0.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwYR7AAoJEPQ0oe+v7q6j5EUP/2E0Yy3OiM969qDUFRIUXqKh
8TlBC0YeCGSjCGvmu0GSogg6oig2UdDsM1NpAcc+B4f4hhqerxv8KYFUNyoDGEDx
4x3Egznn27k8ka2rgDNI4DVdJWYnWNy0I+rtSQ3x77gNG8jNr3pKL8xmiYUuO26L
CTl98FgMHv8zTpt8V4/1XlPdkqxu6vBZ4gbKvuec6P53FvuMonqpPna4u3QKilkF
jeb97rg1DX5L2mjwzu3duFGkdCpmE+/F1YWiPp7BXqVtcHQIv8TEzooNjDt3qPEK
e+GVp0vgyeqUVNNqR7ARZtXDcC4QbTstj22AtOcCF5B6p6X/RH6A6VIzCrIxM4c1
SFFgA5cKtWHOOilFogCFv2+ldcV55Ksidxi58Zi0DWdXjz768LoablN8IVJYAkxa
A8PoNV9gSoYHOFEDttSr3BHetJS8mvQJC+t643XrZpwGVOtb33xhg33glXqhDrEi
zt/UcMKo1mJPfiOSfzF+b6Rd3/+9L/EKTv2TSLy4p0Wj4bQHsQ1IzJEUzTTeNNPh
5P+nRYzTaySKa7eaIVjPwVzwifDQI00bUzrr/ordSzrgpEeSaMYS6WRWnDYyPdEv
TODuCQQYP/Np9zewVEr0aXqbjuqMdVcnDTFuBIA5q6RlMB5UMxKpgAqVj/jBEhnS
iIh3b//w4r+ZRBpulE5+
=5N7U
-END PGP SIGNATURE-

Changes since libreoffice-4.1.0.1:
Andras Timar (1):
  buildfix

---
 source/kk/dbaccess/source/ui/misc.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.1-buildfix1'

2013-06-19 Thread Christian Lohmaier 
Tag 'libreoffice-4.1.0.1-buildfix1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-19 11:14 -0700

Tag libreoffice-4.1.0.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRwYR6AAoJEPQ0oe+v7q6jDhAP/3D+RaUA6nLdSY+hjfiAGwfp
cI8gvHQSFkOeb1iphHAleD+mHO3kFC41VUOotp9vfx83ERaJ49IMcrc7bWCa8rCr
BVKuKVIAr8VQK+0gqbK7C2hBA2tWHPHRpHoO5ttz64M7W5DugwMXGGj+W+vCqh9V
hMqxaCOCTqzeZFdoakG0b0oqUNLOIkZqPNNOW2IkUQ01bLOfnTQzNAzRBs7Me/A0
K+p1EZA75zoAYxukFGz8+sMSra04N0UgCbmFOGPAOuMgU6IkqoeG5isywXwpbvVo
EhkjII51ZJc1E0rhj2wuHJT9/FE6yQSisVw/3tTfwlaY6Mzgcit3agP8nbCHurXF
tYyE0uBFLFJu14CGLKwUO3QFvzglODOSHiUp2sK1Q+hwKj4VadZKpRN1/MpQDbMn
oEsFVnRr0r197t1Tscwh8JXf4s/GPKguUrjj7cBUgGfdrl90rxzqRo6V9i+gNlRO
0V3BzONIsEI5ZxVkncx0DsMAuSYpdk9iwin/pjAstGW+O43gWI/eGNADeLY2kSPT
r+N8lSAXoI9Whx4xLiBqEVam9KDcNc5OweIeTNg+TBhxrlOCyWA1Yisb2jQw0u8f
9Anx72hCZxr8/W4mn0q4D9y3iSAtTrJp5jPh42TnD1/J1J8BJdsfHp0mRct9iNUl
/bTLW15iyhwhgpH/Dvs9
=82aV
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-13:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Hackfest kit ?

2013-06-19 Thread Eike Rathke 
Hi Immanuel,

On Monday, 2013-06-17 15:10:19 -0400, Immanuel Giulea wrote:

 I am planning a hackfest/hackathon in Montreal, Canada and I was wondering
 what resources were available to prepare such an event?

Obviously you need a room capable to hold the expected number of people
with tables and proper seating. We were ~20 people on the Hamburg
Hackfest last weekend, ~25-30 in Munich last year, but these numbers are
probably higher than what can be expected for Montreal because Germany
is somewhat the home play for LibreOffice and within good reach for
European hackers.

Also good if the room or a next one has a recreational area with
armchairs or couches. Best if the room isn't bare and sterile ;) an
already existing hacker space mostly makes feel comfy.

Of course you need Internet connectivity, WiFi if possible so people can
carry around their laptops without loosing connection. Have enough plugs
for everybody and extension cables / multi sockets. A projector (and
white wall) may be good in case someone wants to show something to all
or hold a lightning talk.

To tune into a friendly atmosphere and get to know each other have
a social event the evening before (i.e. Friday if hackfest on weekend),
like a dinner or beer event. Best if some sponsor pays for it ;-)

Provide enough drinks and food and fruits for all days, all sorts of
caffeinated drinks are welcomed, some beer for the evening, bread rolls,
cheese, ham, salami, snacks, apples, bananas, strawberries ;-)  Order
(sponsored) pizza in the evening.

Last but not least, have fun and hack :-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpItesnOZ44r.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [ANNOUNCE] libreoffice-4.1.0.1 tag created

2013-06-19 Thread Christian Lohmaier 
Hi *,

On Tue, Jun 18, 2013 at 4:03 PM, Christian Lohmaier
lohma...@googlemail.com wrote:

 The tag libreoffice-4.1.0.1 (AKA RC1) has been created. The
 corresponding official builds will be available within next few days.

Because there was a quoting error in one of the translations, the tag

 libreoffice-4.1.0.1-buildfix1

has been created.
Only translation submodule did change, and only Kazakh language(kk) is affected.

http://cgit.freedesktop.org/libreoffice/translations/commit/?id=f59b988247b53c35ae6c90151db3798a912e8f7e

is the only change.

To switch your tree to it, use:

./g fetch --tags
./g checkout -b tag-libreoffice-4.1.0.1-buildfix1 libreoffice-4.1.0.1-buildfix1

An new tarball for the translations submodule including the fix has
been uploaded to
http://dev-builds.libreoffice.org/pre-releases/src/

Best Regards,
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-06-19 Thread David Tardon 
 writerfilter/source/rtftok/rtffly.hxx |   42 --
 1 file changed, 15 insertions(+), 27 deletions(-)

New commits:
commit fa2363344cbf85af17a80c4757b226ab43391af6
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 12:38:43 2013 +0200

fix rtf import on big endian

Change-Id: Ia9f589752176849f7f6700483e933767e509edf3

diff --git a/writerfilter/source/rtftok/rtffly.hxx 
b/writerfilter/source/rtftok/rtffly.hxx
index ab68cfc..d07a8ac 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -17,18 +17,18 @@ namespace writerfilter {
 {
 public:
 RTFVertOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -71,19 +71,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 
 /// Stores the horizontal orientation properties of an RTF fly frame.
@@ -91,18 +83,23 @@ namespace writerfilter {
 {
 public:
 RTFHoriOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_LONIBBLE(OSL_HIBYTE(nVal));
+}
+
+sal_uInt16 GetRelAnchor() const
+{
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -151,20 +148,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelAnchor : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 } // namespace rtftok
 } // namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/uiconfig

2013-06-19 Thread Efe Gürkan YALAMAN 
 cui/uiconfig/ui/aboutconfigdialog.ui |  109 ++-
 1 file changed, 107 insertions(+), 2 deletions(-)

New commits:
commit c3c3c9f1c6614e95ab136a42f2d6e91a9feca303
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date:   Wed Jun 19 14:01:09 2013 +0300

second prototype of the aboutconfigdialog.ui

This prototype has SvxSimpleTableContainer and a few labels related.

Change-Id: I1cda9fdecc5b670f363da1d4ef94ff1663b03530

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index 1838ce7..e3af350 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -20,6 +20,8 @@
 property name=labelgtk-ok/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
 property name=receives_defaultTrue/property
 property name=use_stockTrue/property
   /object
@@ -80,11 +82,114 @@
   /packing
 /child
 child
-  object class=GtkGrid id=grid1
+  object class=GtkFrame id=frame1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
 child
-  placeholder/
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkGrid id=grid1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=column_homogeneousTrue/property
+child
+  object class=GtkLabel id=preference
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property 
name=yalign0.4900953674316/property
+property name=label 
translatable=yesPreference Name/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=status
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property 
name=xalign0.5198092651367/property
+property 
name=yalign0.5099046325684/property
+property name=label 
translatable=yesStatus/property
+  /object
+  packing
+property name=left_attach1/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=type
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label 
translatable=yesType/property
+  /object
+  packing
+property name=left_attach2/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=value
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label 
translatable=yesValue/property
+  /object
+  packing
+property name=left_attach3/property

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries

2013-06-19 Thread Fridrich Štrba 
 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6af376566b55c504335ccfae0fd82d6d2a0c75dd
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jun 19 13:09:22 2013 +0200

Update core

Change-Id: I724b5ec0a5e8d052c47c56364bd7601bd0c5bff9

diff --git a/dictionaries b/dictionaries
index 9ec57a8..dbfffe3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9ec57a8df294f82d2b038ada757e3924406d7719
+Subproject commit dbfffe3512457095ea99f7362ff64b1431b820b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Caolán McNamara 
 include/vcl/bitmap.hxx  |   29 -
 include/vcl/bitmapex.hxx|   32 +
 svtools/source/control/ctrlbox.cxx  |   14 +-
 svtools/source/control/valueset.cxx |   14 +-
 sw/source/core/txtnode/txtedt.cxx   |   13 ++
 sw/source/core/undo/unins.cxx   |   13 ++
 vcl/source/control/ilstbox.cxx  |   32 ++---
 vcl/source/gdi/bitmap4.cxx  |  194 
 vcl/source/gdi/bitmapex.cxx |  149 +++
 vcl/source/gdi/outdev2.cxx  |9 +
 10 files changed, 238 insertions(+), 261 deletions(-)

New commits:
commit 18eba6a69f49c9e8e2902f84e96cb6906ee337f1
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 12:14:52 2013 +0100

bounds can be -1 for not-found

Change-Id: I941ef1dae00167460f2f0de39e472ed047539f27

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 1716010..691da30 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -595,6 +595,15 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 }
 }
 
+sal_Int32 clipIndexBounds(const OUString rStr, sal_Int32 nPos)
+{
+if (nPos  0)
+return 0;
+if (nPos  rStr.getLength())
+return rStr.getLength();
+return nPos;
+}
+
 /*
  *SwTxtNode::GetCurWord()
  *
@@ -640,6 +649,10 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
 if (aBndry.endPos != aBndry.startPos  IsSymbol( 
(xub_StrLen)aBndry.startPos ))
 aBndry.endPos = aBndry.startPos;
 
+// can have -1 as start/end of bounds not found
+aBndry.startPos = clipIndexBounds(m_Text, aBndry.startPos);
+aBndry.endPos = clipIndexBounds(m_Text, aBndry.endPos);
+
 return m_Text.copy(aBndry.startPos,
aBndry.endPos - aBndry.startPos);
 }
commit 967b623031cd115722e2708f1281282ca8dccbe0
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 11:10:08 2013 +0100

unusual negative start point on split node undo

Change-Id: I787371e95d9787616ca713c808098b80e40acab0

diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 4ac9ecb..eafb7f4 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -74,9 +74,18 @@ String * SwUndoInsert::GetTxtFromDoc() const
 
 if( pCNd-IsTxtNode() )
 {
-pResult = new String(
-static_castSwTxtNode*(pCNd)-GetTxt().copy(nCntnt-nLen, nLen));
+OUString sTxt = static_castSwTxtNode*(pCNd)-GetTxt();
 
+sal_Int32 nStart = nCntnt-nLen;
+sal_Int32 nLength = nLen;
+
+if (nStart  0)
+{
+nLength += nStart;
+nStart = 0;
+}
+
+pResult = new String(sTxt.copy(nStart, nLength));
 }
 
 return pResult;
commit c96802f0e2e553bfbb3bd036df95ea34d2f5741a
Author: Armin Le Grand a...@apache.org
Date:   Wed Jun 5 14:51:49 2013 +

Resolves: #i122418# Added workaround to not use GetBitmap on windows

(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f)

Conflicts:
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/bitmapex.hxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bitmapex.cxx

Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b4e07fb..49dd147 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -811,35 +811,6 @@ public:
 const Link* pProgress = NULL );
 
 public:
-/** Draw a blend frame to the Bitmap
-
-@param nAlpha
-The blend value defines how strong the frame will be blended with the
-existing content, 255 == full coverage, 0 == no frame will be drawn
-
-@param aColorTopLeft, aColorBottomRight, aColorTopRight, 
aColorBottomLeft
-The colors defining the frame. If the version without aColorTopRight 
and
-aColorBottomLeft is used, these colors are linearly interpolated from
-aColorTopLeft and aColorBottomRight using the width and height of the 
area
-
-@param rTopLeft
-The start point of the frame in pixels
-
-@param rSize
-The size of the frame in pixels
- */
-void DrawBlendFrame(
-sal_uInt8 nAlpha = 128,
-Color aColorTopLeft = Color(COL_WHITE),
-Color aColorBottomRight = Color(COL_BLACK));
-void DrawBlendFrame(
-const Point rTopLeft,
-const Size rSize,
-sal_uInt8 nAlpha = 128,
-Color   aColorTopLeft = Color(COL_WHITE),
-Color   aColorTopRight = Color(COL_GRAY),
-Color   aColorBottomRight = Color(COL_BLACK),
-Color   aColorBottomLeft = Color(COL_GRAY));
 
 BitmapReadAccess*   AcquireReadAccess();
 BitmapWriteAccess*  AcquireWriteAccess();
diff --git

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

2013-06-19 Thread Caolán McNamara 
 13/6976efb17b8617a83c7f26601cd04031b51e7f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 75317768fffb73f39993ae3d427f7b945338de9e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 12:17:33 2013 +0100

Notes added by 'git notes add'

diff --git a/13/6976efb17b8617a83c7f26601cd04031b51e7f 
b/13/6976efb17b8617a83c7f26601cd04031b51e7f
new file mode 100644
index 000..77400a7
--- /dev/null
+++ b/13/6976efb17b8617a83c7f26601cd04031b51e7f
@@ -0,0 +1 @@
+merged as: c96802f0e2e553bfbb3bd036df95ea34d2f5741a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source sw/source

2013-06-19 Thread Armin Le Grand 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   57 ++--
 sw/source/core/draw/dcontact.cxx|   20 +--
 2 files changed, 48 insertions(+), 29 deletions(-)

New commits:
commit bc69be88fa43901504126740bc8810f4e31e17a5
Author: Armin Le Grand a...@apache.org
Date:   Tue Jun 18 13:10:42 2013 +

Resolves: #i121917# Corrected access to text object

(cherry picked from commit 2c9c9923fdf042c41cebaf9a15def7caac86032d)

Conflicts:
sw/source/core/draw/dcontact.cxx

Change-Id: Ia214127ca540c4f4036a0006e7c227649fb39134
(cherry picked from commit 6c5c5584eb1adb64fee3aaf76196115ba3812e2c)

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5854e36..20879f1 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -150,6 +150,34 @@ void PosSizePropertyPanel::ShowMenu (void)
 
 
 
+namespace
+{
+bool hasText(const SdrView rSdrView)
+{
+const SdrMarkList rMarkList = rSdrView.GetMarkedObjectList();
+
+if(1 == rMarkList.GetMarkCount())
+{
+const SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
+const SdrObjKind eKind((SdrObjKind)pObj-GetObjIdentifier());
+
+if((pObj-GetObjInventor() == SdrInventor)  (OBJ_TEXT == eKind 
|| OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind))
+{
+const SdrTextObj* pSdrTextObj = dynamic_cast const 
SdrTextObj* (pObj);
+
+if(pSdrTextObj  pSdrTextObj-HasText())
+{
+return true;
+}
+}
+}
+
+return false;
+}
+} // end of anonymous namespace
+
+
+
 void PosSizePropertyPanel::Initialize()
 {
 mpFtPosX-SetBackground(Wallpaper());
@@ -222,18 +250,7 @@ void PosSizePropertyPanel::Initialize()
 if ( mpView != NULL )
 {
 maUIScale = mpView-GetModel()-GetUIScale();
-
-const SdrMarkList rMarkList = mpView-GetMarkedObjectList();
-if(1 == rMarkList.GetMarkCount())
-{
-const SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-const SdrObjKind eKind((SdrObjKind)pObj-GetObjIdentifier());
-
-if((pObj-GetObjInventor() == SdrInventor)  (OBJ_TEXT == eKind 
|| OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind)  
((SdrTextObj*)pObj)-HasText())
-{
-mbAdjustEnabled = true;
-}
-}
+mbAdjustEnabled = hasText(*mpView);
 }
 
 mePoolUnit = maTransfWidthControl.GetCoreMetric();
@@ -701,20 +718,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 if ( mpView == NULL )
 return;
 
-const SdrMarkList rMarkList = mpView-GetMarkedObjectList();
-
-if(1 == rMarkList.GetMarkCount())
-{
-const SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-const SdrObjKind eKind((SdrObjKind)pObj-GetObjIdentifier());
-
-if((pObj-GetObjInventor() == SdrInventor)  (OBJ_TEXT == eKind || 
OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind)  
((SdrTextObj*)pObj)-HasText())
-mbAdjustEnabled = true;
-else
-mbAdjustEnabled = false;
-}
-else
-mbAdjustEnabled = false;
+mbAdjustEnabled = hasText(*mpView);
 
 // Pool unit and dialog unit may have changed, make sure that we
 // have the current values.
@@ -938,6 +942,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 }
 
 const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
+const SdrMarkList rMarkList = mpView-GetMarkedObjectList();
 
 switch (rMarkList.GetMarkCount())
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index cc6f1a5..6026513 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2332,8 +2332,16 @@ basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() 
const
 SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const
 {
 SdrHdl* pHdl = rRefObj.GetHdl(nHdlNum);
-Point aP(pHdl-GetPos() + GetOffset());
-pHdl-SetPos(aP);
+
+if(pHdl)
+{
+Point aP(pHdl-GetPos() + GetOffset());
+pHdl-SetPos(aP);
+}
+else
+{
+OSL_ENSURE(false, Got no SdrHdl(!));
+}
 
 return pHdl;
 }
@@ -2342,8 +2350,14 @@ SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl rHdl, 
sal_uInt16 nPlNum) const
 {
 SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum);
 
-if (pHdl)
+if(pHdl)
+{
 pHdl-SetPos(pHdl-GetPos() + GetOffset());
+}
+else
+{
+OSL_ENSURE(false, Got no SdrHdl(!));
+}
 
 return pHdl;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - helpcontent2 translations

2013-06-19 Thread Fridrich Štrba 
 helpcontent2 |2 +-
 translations |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8bba0911ccffe72d5db53358afe751f8d2da4251
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jun 19 13:31:08 2013 +0200

Syncing core with translations

Change-Id: I2a1ff066468144086b26eb75854478e244bfdba6

diff --git a/translations b/translations
index 9b5110f..46c683c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9b5110fd0c47fb475a83ae33b286bdcff2652784
+Subproject commit 46c683c740acf324164f188a97abea28fe3c1bf9
commit 6ac974ac81bc763838532693e663ca3baea0758f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jun 19 13:28:40 2013 +0200

Setting helpcontent2 on the branch

Change-Id: Ie156fa098887a9a4cf5d9c20e43116f771e79a81

diff --git a/helpcontent2 b/helpcontent2
index e15ec69..81f2a2b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
+Subproject commit 81f2a2b6bffadded71b81ac7ccae3ff1574a341b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 5 commits - oox/source writerfilter/source

2013-06-19 Thread Cédric Bosdonnat 
 oox/source/vml/vmlshape.cxx  |   11 ++--
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   20 ---
 writerfilter/source/dmapper/GraphicImport.cxx|3 --
 writerfilter/source/dmapper/PropertyMap.cxx  |4 +--
 writerfilter/source/dmapper/StyleSheetTable.cxx  |3 --
 writerfilter/source/dmapper/WrapPolygonHandler.cxx   |8 +++---
 writerfilter/source/dmapper/WrapPolygonHandler.hxx   |2 -
 7 files changed, 35 insertions(+), 16 deletions(-)

New commits:
commit ebd25b53f8416340391429921232a8b0fbb1f331
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed May 22 11:34:01 2013 +0200

n#816593: Floating table width import fix: adjust the frame width

(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b)

Conflicts:
sw/qa/extras/ooxmlimport/data/table_width.docx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152
(cherry picked from commit 33e392e7d4fbfc61480751311e7187a5730acc78)

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a3bdb71..3b5aa4c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -779,9 +779,23 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 if (xTable.is()  xStart.is()  xEnd.is())
 {
 uno::Referencebeans::XPropertySet xTableProperties(xTable, 
uno::UNO_QUERY);
-aFrameProperties.realloc(aFrameProperties.getLength() + 1);
-aFrameProperties[aFrameProperties.getLength() - 1].Name = Width;
-aFrameProperties[aFrameProperties.getLength() - 1].Value = 
xTableProperties-getPropertyValue(Width);
+sal_Bool bIsRelative = sal_False;
+xTableProperties-getPropertyValue(IsWidthRelative) = 
bIsRelative;
+if (!bIsRelative)
+{
+aFrameProperties.realloc(aFrameProperties.getLength() + 1);
+aFrameProperties[aFrameProperties.getLength() - 1].Name = 
Width;
+aFrameProperties[aFrameProperties.getLength() - 1].Value = 
xTableProperties-getPropertyValue(Width);
+}
+else
+{
+aFrameProperties.realloc(aFrameProperties.getLength() + 1);
+aFrameProperties[aFrameProperties.getLength() - 1].Name = 
FrameWidthPercent;
+aFrameProperties[aFrameProperties.getLength() - 1].Value = 
xTableProperties-getPropertyValue(RelativeWidth);
+
+// Applying the relative width to the frame, needs to have the 
table width to be 100% of the frame width
+xTableProperties-setPropertyValue(RelativeWidth, 
uno::makeAny(sal_Int16(100)));
+}
 
 // A non-zero left margin would move the table out of the frame, 
move the frame itself instead.
 xTableProperties-setPropertyValue(LeftMargin, 
uno::makeAny(sal_Int32(0)));
commit 666482ebbd1f459bf8ace91c9374590b1bfaa978
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jun 12 16:01:00 2013 +0200

n#779642: 0 width or height in //v:shape[@style] produces weird results

(cherry picked from commit b7144acb2bfa369fb89146d060dbd8ddd547f4c1)

Conflicts:
oox/source/vml/vmlshape.cxx

Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b
(cherry picked from commit 3ad1d411f658b0c2bc8e318aebb999ab75675327)

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 32ab756..bf421863 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -192,11 +192,18 @@ awt::Rectangle ShapeType::getAbsRectangle() const
 
 awt::Rectangle ShapeType::getRelRectangle() const
 {
+sal_Int32 nWidth = maTypeModel.maWidth.toInt32();
+if ( nWidth == 0 )
+nWidth = 1;
+
+sal_Int32 nHeight = maTypeModel.maHeight.toInt32();
+if ( nHeight == 0 )
+nHeight = 1;
+
 return awt::Rectangle(
 maTypeModel.maLeft.toInt32(),
 maTypeModel.maTop.toInt32(),
-maTypeModel.maWidth.toInt32(),
-maTypeModel.maHeight.toInt32() );
+nWidth, nHeight );
 }
 
 // 
commit f2100b09abdf7893104f23f33cf77cc0848b55cb
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jun 19 10:42:47 2013 +0200

n#820800: docx import of wrap polyon was based on dest size of picture

... instead of the original size of it.

Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09
(cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index e64beca..20dd71a 100644
---

Re: Hackfest kit ?

2013-06-19 Thread Bjoern Michaelsen 
Hi Immanuel, Eike,

On Wed, Jun 19, 2013 at 12:30:43PM +0200, Eike Rathke wrote:
 Obviously you need a room capable to hold the expected number of people
 with tables and proper seating. We were ~20 people on the Hamburg
 Hackfest last weekend, ~25-30 in Munich last year, but these numbers are
 probably higher than what can be expected for Montreal because Germany
 is somewhat the home play for LibreOffice and within good reach for
 European hackers.

For Montreal, promoting the event locally would be even more important. It
would be highly helpful to find some connection to a local computer science
department (maybe even get the support of a professor), to get some students on
board. Print flyers and posters.[1]

With regard to missing home play, you likely need to sponsor to fly in some
some experienced hackers to bootstrap the event. I would even consider calling
them speakers -- it suggests a shy interested reader that he can come by and
can passively consume a talk. Depending on the audience that may be the start,
but in the long run, we ideally want to do an introduction and then move on to
a more workshop-like feeling to get things done.

 Last but not least, have fun and hack :-)

One more organizational thing: Offer distibuted couchsurfing in some kind or
way -- not only is it a cheap accomodation, it also helps creating social
bonding[2].

Best,

Bjoern

[1] template: 
https://wiki.documentfoundation.org/File:HackfestHamburg2013Flyer.odg
[2] Im saying that as someone being told You should call your mother more
often! on the Hackfest. ;)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util sc/source

2013-06-19 Thread Armin Le Grand 
 instsetoo_native/util/openoffice.lst |2 +-
 sc/source/ui/view/gridwin.cxx|   14 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 73a9e800ff4f61058750acb6840af780a0505b49
Author: Armin Le Grand a...@apache.org
Date:   Wed Jun 19 11:23:41 2013 +

i122497 Filter DD flags for calc DD

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 108525c..e397dfa 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3565,6 +3565,13 @@ sal_Int8 ScGridWindow::AcceptDrop( const 
AcceptDropEvent rEvt )
 {
 sal_Int8 nMyAction = rEvt.mnAction;
 
+// clear DND_ACTION_LINK when other actions are set. The usage 
below cannot handle
+// multiple set values
+if((nMyAction  DND_ACTION_LINK)  (nMyAction  
(DND_ACTION_COPYMOVE)))
+{
+nMyAction = ~DND_ACTION_LINK;
+}
+
 if ( !rData.pDrawTransfer ||
 !IsMyModel(rData.pDrawTransfer-GetDragSourceView()) ) 
 // drawing within the document
 if ( rEvt.mbDefault  nMyAction == DND_ACTION_MOVE )
@@ -3573,7 +3580,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent 
rEvt )
 ScDocument* pThisDoc = pViewData-GetDocument();
 SdrObject* pHitObj = pThisDoc-GetObjectAtPoint(
 pViewData-GetTabNo(), PixelToLogic(rEvt.maPosPixel) );
-if ( pHitObj  nMyAction == DND_ACTION_LINK  
!rData.pDrawTransfer )
+if ( pHitObj  nMyAction == DND_ACTION_LINK ) //  
!rData.pDrawTransfer )
 {
 if ( IsDropFormatSupported(SOT_FORMATSTR_ID_SVXB)
 || IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE)
@@ -4191,8 +4198,9 @@ sal_Int8 ScGridWindow::ExecuteDrop( const 
ExecuteDropEvent rEvt )
 }
 
 Point aLogicPos = PixelToLogic(aPos);
+sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
 
-if (rData.pDrawTransfer)
+if (!bIsLink  rData.pDrawTransfer)
 {
 sal_uInt16 nFlags = rData.pDrawTransfer-GetDragSourceFlags();
 
@@ -4228,8 +4236,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const 
ExecuteDropEvent rEvt )
 }
 }
 
-sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
-
 ScDocument* pThisDoc = pViewData-GetDocument();
 SdrObject* pHitObj = pThisDoc-GetObjectAtPoint( pViewData-GetTabNo(), 
PixelToLogic(aPos) );
 if ( pHitObj  bIsLink )
commit ff8c8d3c169bb1adf489bca080a91fd5f7bea95f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Wed Jun 19 10:08:34 2013 +

122444: new UpdateURL to reflect new location for the XML update feeds

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index ffc9807..2de02be 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -71,7 +71,7 @@ Apache_OpenOffice
 ABOUTBOXPRODUCTVERSION 4.0.0
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
-UPDATEURL 
https://ooo-site.apache.org/projects/update/aoo40/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoo40/check.Update
 ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 ADDSYSTEMINTEGRATION 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] needful function on calc

2013-06-19 Thread Eike Rathke 
Hi Deve,

On Wednesday, 2013-06-19 09:43:28 +0200, Deve wrote:

 Something new in this topic?

I assume you're referring
http://nabble.documentfoundation.org/needful-function-on-calc-tt2824180.html

Note that there's the CorelPolyGUI extension that may do what you want
http://extensions.libreoffice.org/extension-center/improved-trend-lines


However, for feature and enhancement requests it is best if you submit
the request in Bugzilla, in this case for the Chart component if
I haven't misunderstood
https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOfficecomponent=Chartversion=unspecifiedbug_severity=enhancement

so the request doesn't get lost and someone can pick it up.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpJrEjEhazn0.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - configure.ac vcl/coretext

2013-06-19 Thread Tor Lillqvist 
 configure.ac  |2 +-
 vcl/coretext/ctlayout.cxx |   39 ++-
 2 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit b9c46f46cebc0ebed5a91f8fbb9d0a01366f1f77
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 15:12:30 2013 +0300

fdo#63616: Fix GetBoundRect for rotated text in CoreText backend

Change-Id: I8c9ee84afd71481c2c6b002265b86e048f369f5c

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index e2a118b..1e89a39 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -433,18 +433,39 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) const
 return false;
 #endif
 
+CGContextSaveGState( rAquaGraphics.mrContext );
+CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 );
+CGContextSetShouldAntialias( rAquaGraphics.mrContext, 
!rAquaGraphics.mbNonAntialiasedText );
+
+const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) );
+CGPoint aTextPos = { (CGFloat) +aVclPos.X(), (CGFloat) -aVclPos.Y() };
+
+if( mpTextStyle-mfFontRotation != 0.0 )
+{
+const CGFloat fRadians = mpTextStyle-mfFontRotation;
+CGContextRotateCTM( rAquaGraphics.mrContext, +fRadians );
+
+const CGAffineTransform aInvMatrix = CGAffineTransformMakeRotation( 
-fRadians );
+aTextPos = CGPointApplyAffineTransform( aTextPos, aInvMatrix );
+}
+
+CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x, aTextPos.y 
);
 CGRect aMacRect = CTLineGetImageBounds( mpCTLine, rAquaGraphics.mrContext 
);
-CGPoint aMacPos = CGContextGetTextPosition( rAquaGraphics.mrContext );
-aMacRect.origin.x -= aMacPos.x;
-aMacRect.origin.y -= aMacPos.y;
 
-const Point aPos = GetDrawPosition( Point(mnBaseAdv, 0) );
+if( mpTextStyle-mfFontRotation != 0.0 )
+{
+const CGFloat fRadians = mpTextStyle-mfFontRotation;
+const CGAffineTransform aMatrix = CGAffineTransformMakeRotation( 
+fRadians );
+aMacRect = CGRectApplyAffineTransform( aMacRect, aMatrix );
+}
+
+CGContextRestoreGState( rAquaGraphics.mrContext );
+
+rVCLRect.Left()   = aVclPos.X() + aMacRect.origin.x;
+rVCLRect.Right()  = aVclPos.X() + (aMacRect.origin.x + 
aMacRect.size.width);
+rVCLRect.Bottom() = aVclPos.Y() - (aMacRect.origin.y);
+rVCLRect.Top()= aVclPos.Y() - (aMacRect.origin.y + 
aMacRect.size.height);
 
-// CoreText top-bottom are vertically flipped from a VCL aspect
-rVCLRect.Left()   = aPos.X() + aMacRect.origin.x;
-rVCLRect.Right()  = aPos.X() + (aMacRect.origin.x + aMacRect.size.width);
-rVCLRect.Bottom() = aPos.Y() - aMacRect.origin.y;
-rVCLRect.Top()= aPos.Y() - (aMacRect.origin.y + aMacRect.size.height);
 return true;
 }
 
commit a662d427108d781122f979392ce544017d14fc17
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 13:36:27 2013 +0300

Don't use -d32 when building 64-bit code

Change-Id: I83a960cebb8347170a08d2fda7ed11050b8c4229

diff --git a/configure.ac b/configure.ac
index 3f36bca..51a534f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6253,7 +6253,7 @@ if test $SOLAR_JAVA != ; then
 fi
 JAVAINTERPRETER=`cygpath -d $JAVAINTERPRETER`
 JAVAINTERPRETER=`cygpath -u $JAVAINTERPRETER`
-elif test $_os = Darwin; then
+elif test $_os = Darwin -a $BITNESS_OVERRIDE = ; then
 dnl HACK:  There currently is only a 32 bit version of LibreOffice for 
Mac OS X,
 dnl and Tiger Java complains about -d32 while Snow Leopard Java needs 
it
 dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 63616, which changed state.

Bug 63616 Summary: Vertical ruler is unreadable
https://bugs.freedesktop.org/show_bug.cgi?id=63616

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
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 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

2013-06-19 Thread Andras Timar 
 instsetoo_native/util/openoffice.lst |   10 +-
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 99c9338276339572eeed3b00033c03282105ca8e
Author: Andras Timar ati...@suse.com
Date:   Wed Jun 19 14:16:43 2013 +0200

Bump for 3.6-29

Change-Id: I551bce4ae38687fc7decd96b0466e951808c2768

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 9ad8e63..7dc2cd1 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,13 +32,13 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 28
+WINDOWSPATCHLEVEL 29
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
 STARTCENTER_HIDE_EXTERNAL_LINKS 0
 }
-}
+}+3
 }
 
 LibreOffice
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-529
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-529
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-529
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ff2685f..780433c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:528)
-BUILD=528
+RSCREVISION=360m1(Build:529)
+BUILD=529
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Tor Lillqvist 
 vcl/coretext/ctlayout.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 47dca10811a31cf28e72b9bc034b9d8975327df3
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 15:25:26 2013 +0300

Add comment

Change-Id: Id3ec71e8da07a8bf1c979585eb84cd5a9d6f7a77

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 1e89a39..721d770 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -426,6 +426,11 @@ void CTLayout::GetCaretPositions( int nMaxIndex, 
sal_Int32* pCaretXArray ) const
 
 bool CTLayout::GetBoundRect( SalGraphics rGraphics, Rectangle rVCLRect ) 
const
 {
+// Closely mimic DrawText(), except that instead of calling
+// CTLineDraw() to draw the line, we call CTLineGetImageBounds()
+// to get its bounds. But all the coordinate system manipulation
+// before that is the same = should be factored out?
+
 AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics);
 
 #ifdef IOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread David Tardon 
 cui/source/tabpages/transfrm.cxx |2 +-
 svx/source/svdraw/svdedtv1.cxx   |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8c1d1b66904cdd95e8eec746a81cf1c57ad0e85a
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 14:23:44 2013 +0200

fdo#65870 fix changing shape height via dialog

Change-Id: I7c61be2c3d368dfd3ea66427c77636f797a7e88a

diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 196779b..85ea67d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1522,6 +1522,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet 
rAttr)
 if 
(SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,pPoolItem))
 {
 nSizY=((const SfxUInt32Item*)pPoolItem)-GetValue();
 bChgSiz=true;
+bChgHgt=true;
 }
 if (bChgSiz) {
 eSizePoint=(RECT_POINT)((const 
SfxAllEnumItem)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
commit 8fbb2ebc2155b03d1436d9100886318642d47714
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 14:26:41 2013 +0200

fix copypasta

Change-Id: I7744acc8cf1e8b6cad05d22df43f3d5a5beaa2f6

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index a20ea83..9cd709f 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -886,7 +886,7 @@ sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet 
rOutAttrs )
 nHeight = MetricField::ConvertDoubleValue( nHeight, 
maMtrHeight.GetBaseValue(), maMtrHeight.GetDecimalDigits(), meDlgUnit, 
FUNIT_100TH_MM );
 long lHeight = long(nHeight * (double)aUIScale);
 lHeight = OutputDevice::LogicToLogic( lHeight, MAP_100TH_MM, 
(MapUnit)mePoolUnit );
-lHeight = static_castlong(maMtrWidth.Denormalize( lHeight ));
+lHeight = static_castlong(maMtrHeight.Denormalize( lHeight ));
 
 // put Width  Height to itemset
 rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa writerfilter/source

2013-06-19 Thread Adam Co 
 sw/Module_sw.mk   |1 
 sw/qa/extras/ooxmlexport/data/fdo64238_a.docx |binary
 sw/qa/extras/ooxmlexport/data/fdo64238_b.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   44 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   91 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 
 6 files changed, 105 insertions(+), 32 deletions(-)

New commits:
commit 782adba4d436c65cdf85d48f28486321873b15ed
Author: Adam Co rattles2...@gmail.com
Date:   Wed Jun 12 15:06:42 2013 +0300

fdo#64238: fix for missing footer bug

Signed-off-by: Miklos Vajna vmik...@suse.cz

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I328547c41bfc1a23f7e6233db57fbfa415e22cb3
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index d8ca65e..202c67c 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_check_targets,sw,\
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_htmlexport \
 CppunitTest_sw_macros_test \
+CppunitTest_sw_ooxmlexport \
 CppunitTest_sw_ooxmlimport \
 CppunitTest_sw_ww8export \
 CppunitTest_sw_ww8import \
diff --git a/sw/qa/extras/ooxmlexport/data/fdo64238_a.docx 
b/sw/qa/extras/ooxmlexport/data/fdo64238_a.docx
new file mode 100644
index 000..7c43fea
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo64238_a.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo64238_b.docx 
b/sw/qa/extras/ooxmlexport/data/fdo64238_b.docx
new file mode 100644
index 000..bfaf92c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo64238_b.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1cfc0ae..3dbb0a4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -81,6 +81,8 @@ public:
 void testFDO63053();
 void testWatermark();
 void testFdo43093();
+void testFdo64238_a();
+void testFdo64238_b();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -136,6 +138,8 @@ void Test::run()
 {fdo63053.docx , Test::testFDO63053},
 {watermark.docx, Test::testWatermark},
 {fdo43093.docx, Test::testFdo43093},
+{fdo64238_a.docx, Test::testFdo64238_a},
+{fdo64238_b.docx, Test::testFdo64238_b},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -808,6 +812,46 @@ void Test::testFdo43093()
 CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
 }
 
+void Test::testFdo64238_a()
+{
+// The problem was that when 'Show Only Odd Footer' was marked in Word and 
the Even footer *was filled*
+// then LO would still import the Even footer and concatenate it to to the 
odd footer.
+// This case specifically is for :
+// 'Blank Odd Footer' with 'Non-Blank Even Footer' when 'Show Only Odd 
Footer' is marked in Word
+// In this case the imported footer in LO was supposed to be blank, but 
instead was the 'even' footer
+uno::Referencetext::XText xFooterText = getProperty 
uno::Referencetext::XText 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), FooterText);
+uno::Reference text::XTextRange  xFooterParagraph = getParagraphOfText( 
1, xFooterText );
+uno::Referencecontainer::XEnumerationAccess 
xRunEnumAccess(xFooterParagraph, uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRunEnum = 
xRunEnumAccess-createEnumeration();
+int numOfRuns = 0;
+while (xRunEnum-hasMoreElements())
+{
+uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(), 
uno::UNO_QUERY);
+numOfRuns++;
+}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), numOfRuns);
+}
+
+void Test::testFdo64238_b()
+{
+// The problem was that when 'Show Only Odd Footer' was marked in Word and 
the Even footer *was filled*
+// then LO would still import the Even footer and concatenate it to to the 
odd footer.
+// This case specifically is for :
+// 'Non-Blank Odd Footer' with 'Non-Blank Even Footer' when 'Show Only Odd 
Footer' is marked in Word
+// In this case the imported footer in LO was supposed to be just the odd 
footer, but instead was the 'odd' and 'even' footers concatenated
+uno::Referencetext::XText xFooterText = getProperty 
uno::Referencetext::XText 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), FooterText);
+uno::Reference text::XTextRange  xFooterParagraph = getParagraphOfText( 
1, xFooterText );
+uno::Referencecontainer::XEnumerationAccess 
xRunEnumAccess(xFooterParagraph, uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRunEnum = 
xRunEnumAccess-createEnumeration();
+int numOfRuns = 0;
+while (xRunEnum-hasMoreElements())
+{
+uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(),

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Caolán McNamara caol...@redhat.com changed:

   What|Removed |Added

 Depends on||65931

-- 
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: 3 commits - sal/osl sal/textenc

2013-06-19 Thread Tor Lillqvist 
 sal/osl/all/log.cxx  |3 +++
 sal/osl/unx/file.cxx |4 ++--
 sal/textenc/tencinfo.cxx |1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a1936e4183240981af0bf616207994e3a2f7929e
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 11:35:00 2013 +0300

Fix warning: Value stored is never read

Change-Id: Ic41fe1682f19c39faa0a2afc47c11b8a5bead212

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 7a991e8..4e646b0 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -461,7 +461,7 @@ oslFileError FileHandle_Impl::readFileAt (
 if (result != osl_File_E_None)
 return (result);
 
-nBytesRequested -= uDone, *pBytesRead += uDone;
+*pBytesRead += uDone;
 return osl_File_E_None;
 }
 
@@ -533,7 +533,7 @@ oslFileError FileHandle_Impl::writeFileAt (
 if (uDone != nBytesToWrite)
 return osl_File_E_IO;
 
-nBytesToWrite -= uDone, *pBytesWritten += uDone;
+*pBytesWritten += uDone;
 return osl_File_E_None;
 }
 
commit ec13a7bdbf904092df066a52ccb03fda12b4bed3
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 11:26:44 2013 +0300

Fix warning: Value stored to 'eEncoding' is never read

eEncoding is assigned again a few lines below.

Change-Id: Ib475095bab30e0c2f066934a10cda650706c2c8a

diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index 0bcadb7..ded6bc5 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -448,7 +448,6 @@ rtl_TextEncoding SAL_CALL 
rtl_getTextEncodingFromUnixCharset( const char* pUnixC
 {
 if ( Impl_matchString( pSecondPart, pData-mpCharsetStr ) )
 {
-eEncoding = pData-meTextEncoding;
 break;
 }
 
commit f5000d66bac505572a91f2bc391ecc23bd1ee670
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 11:13:20 2013 +0300

Add missing break statements

Found by Clang static analyzer: Value stored to 'prio' is never read.

Change-Id: I7c0e90e5435b028f0a4b4bded304338cb57271cc

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index db5dc7b..3a496b8 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -225,13 +225,16 @@ void log(
 switch (level) {
 case SAL_DETAIL_LOG_LEVEL_INFO:
 prio = LOG_INFO;
+break;
 default:
 assert(false); // this cannot happen
 // fall through
 case SAL_DETAIL_LOG_LEVEL_WARN:
 prio = LOG_WARNING;
+break;
 case SAL_DETAIL_LOG_LEVEL_DEBUG:
 prio = LOG_DEBUG;
+break;
 }
 syslog(prio, %s, s.str().c_str());
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Caolán McNamara 
 sw/source/ui/chrdlg/drpcps.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit cb1ec05a72d54d55c8a98778c56ee01197cf45f4
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 13:55:23 2013 +0100

Resolves: fdo#65931 why are we futzing with leading on the preview anyway

Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 1a11874..afb51f1 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -71,7 +71,6 @@ class SwDropCapsPict : public Control
 longmnLineH;
 longmnTextH;
 sal_uInt16  mnDistance;
-sal_Int32   mnLeading;
 Printer*mpPrinter;
 boolmbDelPrinter;
 /// The _ScriptInfo structure holds information on where we change from one
@@ -243,7 +242,6 @@ void SwDropCapsPict::UpdatePaintSettings( void )
 // gray lines
 mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES;
 mnLineH = mnTotLineH - 2;
-mnLeading = GetFontMetric().GetIntLeading();
 
 Font aFont;
 {
@@ -302,11 +300,11 @@ void SwDropCapsPict::UpdatePaintSettings( void )
 maCJKFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
 maCTLFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
 
-maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height() + mnLeading));
-maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height() + mnLeading));
+maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height()));
+maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height()));
 
 SetFont(aFont);
-aFont.SetSize(Size(0, aFont.GetSize().Height() + mnLeading));
+aFont.SetSize(Size(0, aFont.GetSize().Height()));
 SetFont(aFont);
 maFont = aFont;
 
@@ -356,7 +354,7 @@ void  SwDropCapsPict::Paint(const Rectangle /*rRect*/)
 DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
 
 // draw Text
-DrawPrev( Point( BORDER, nY0 - mnLeading ) );
+DrawPrev( Point( BORDER, nY0 ) );
 }
 
 SetClipRegion();
___
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' - ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f

2013-06-19 Thread Caolán McNamara 
 ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 08da40e1e727af87466b11a38704c0ddcb31890b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 14:02:51 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

2013-06-19 Thread Caolán McNamara 
 sw/source/ui/chrdlg/drpcps.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 90f381f02336126e850c657dc62ae0d2cc7b33ca
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 13:55:23 2013 +0100

Resolves: fdo#65931 why are we futzing with leading on the preview anyway

Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f
(cherry picked from commit cb1ec05a72d54d55c8a98778c56ee01197cf45f4)
Reviewed-on: https://gerrit.libreoffice.org/4363
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 1a11874..afb51f1 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -71,7 +71,6 @@ class SwDropCapsPict : public Control
 longmnLineH;
 longmnTextH;
 sal_uInt16  mnDistance;
-sal_Int32   mnLeading;
 Printer*mpPrinter;
 boolmbDelPrinter;
 /// The _ScriptInfo structure holds information on where we change from one
@@ -243,7 +242,6 @@ void SwDropCapsPict::UpdatePaintSettings( void )
 // gray lines
 mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES;
 mnLineH = mnTotLineH - 2;
-mnLeading = GetFontMetric().GetIntLeading();
 
 Font aFont;
 {
@@ -302,11 +300,11 @@ void SwDropCapsPict::UpdatePaintSettings( void )
 maCJKFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
 maCTLFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
 
-maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height() + mnLeading));
-maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height() + mnLeading));
+maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height()));
+maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height()));
 
 SetFont(aFont);
-aFont.SetSize(Size(0, aFont.GetSize().Height() + mnLeading));
+aFont.SetSize(Size(0, aFont.GetSize().Height()));
 SetFont(aFont);
 maFont = aFont;
 
@@ -356,7 +354,7 @@ void  SwDropCapsPict::Paint(const Rectangle /*rRect*/)
 DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
 
 // draw Text
-DrawPrev( Point( BORDER, nY0 - mnLeading ) );
+DrawPrev( Point( BORDER, nY0 ) );
 }
 
 SetClipRegion();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 65931, which changed state.

Bug 65931 Summary: drop caps preview grows constantly
https://bugs.freedesktop.org/show_bug.cgi?id=65931

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
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: vcl/coretext

2013-06-19 Thread Tor Lillqvist 
 vcl/coretext/ctlayout.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 97cd0f38a53f97034442de57d48006d30c4a94db
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 16:06:15 2013 +0300

Call CheckContext() on OS X, too

Change-Id: I093586b0c979e492ea2a09dca9525b808de3ce70

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 721d770..18330936 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -433,10 +433,8 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics, 
Rectangle rVCLRect ) const
 
 AquaSalGraphics rAquaGraphics = static_castAquaSalGraphics(rGraphics);
 
-#ifdef IOS
 if( !rAquaGraphics.CheckContext() )
 return false;
-#endif
 
 CGContextSaveGState( rAquaGraphics.mrContext );
 CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source sw/source sw/uiconfig sw/UIConfig_swriter.mk

2013-06-19 Thread Olivier Hallot 
 extras/source/glade/libreoffice-catalog.xml.in |3 
 sw/UIConfig_swriter.mk |1 
 sw/source/ui/chrdlg/drpcps.cxx |  280 ++--
 sw/source/ui/chrdlg/drpcps.hrc |   45 ---
 sw/source/ui/chrdlg/drpcps.src |  142 --
 sw/source/ui/inc/drpcps.hxx|   48 +--
 sw/uiconfig/swriter/ui/dropcapspage.ui |  343 +
 7 files changed, 522 insertions(+), 340 deletions(-)

New commits:
commit d74323815aec2abb25eae026052651ceec7e372a
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Wed Jun 12 15:47:38 2013 -0300

Convert Drop Caps tab page to UI widgets

Conflicts:
sw/UIConfig_swriter.mk

Conflicts:
sw/source/ui/chrdlg/drpcps.cxx

Change-Id: Ic66f367d23b84666dd0165108c405b5b625b798b
Reviewed-on: https://gerrit.libreoffice.org/4236
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 768f155..f717ee0 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -120,6 +120,9 @@
 glade-widget-class title=Caption Preview name=swuilo-SwCaptionPreview
 generic-name=Caption Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Drop Caps Preview name=swuilo-SwDropCapsPict
+generic-name=Drop Caps Preview Window 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Extension List 
name=deploymentgui-ExtBoxWithBtns
 generic-name=Extensions List parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index a5e5101..d7f016d 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/createauthorentry \
sw/uiconfig/swriter/ui/createautomarkdialog \
+   sw/uiconfig/swriter/ui/dropcapspage \
sw/uiconfig/swriter/ui/dropdownfielddialog \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index afb51f1..a404853 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -26,6 +26,7 @@
 #include globals.hrc
 
 #include vcl/metric.hxx
+
 #include svl/stritem.hxx
 #include editeng/fontitem.hxx
 #include sfx2/htmlmode.hxx
@@ -46,7 +47,6 @@
 #include charfmt.hxx
 
 #include chrdlg.hrc
-#include drpcps.hrc
 
 
 using namespace css;
@@ -62,15 +62,16 @@ static sal_uInt16 aPageRg[] = {
 
 class SwDropCapsPict : public Control
 {
+SwDropCapsPage* mpPage;
 String  maText;
 String  maScriptText;
 Color   maBackColor;
 Color   maTextLineColor;
-sal_uInt8   mnLines;
+sal_uInt8   mnLines;
 longmnTotLineH;
 longmnLineH;
 longmnTextH;
-sal_uInt16  mnDistance;
+sal_uInt16  mnDistance;
 Printer*mpPrinter;
 boolmbDelPrinter;
 /// The _ScriptInfo structure holds information on where we change from one
@@ -99,47 +100,71 @@ class SwDropCapsPict : public Control
 voidGetFontSettings( const SwDropCapsPage _rPage, Font 
_rFont, sal_uInt16 _nWhich );
 voidGetFirstScriptSegment(xub_StrLen start, xub_StrLen end, 
sal_uInt16 scriptType);
 boolGetNextScriptSegment(size_t nIdx, xub_StrLen start, 
xub_StrLen end, sal_uInt16 scriptType);
+
 public:
 
-SwDropCapsPict(Window *pParent, const ResId rResId)
-: Control(pParent, rResId)
+SwDropCapsPict(Window *pParent, WinBits nBits)
+: Control(pParent, nBits)
+, mpPage(NULL)
 , mnTotLineH(0)
 , mnLineH(0)
 , mnTextH(0)
 , mpPrinter( NULL )
 , mbDelPrinter( false )
 {}
+
+void SetDropCapsPage(SwDropCapsPage* pPage) { mpPage = pPage; }
+
 ~SwDropCapsPict();
 
 void UpdatePaintSettings( void );   // also invalidates control!
 
-inline void SetText( const OUString rT );
-inline void SetLines( sal_uInt8 nL );
-inline void SetDistance( sal_uInt16 nD );
-inline void SetValues( const String rText, sal_uInt8 nLines, sal_uInt16 
nDistance );
+virtual void Resize();
+virtual Size GetOptimalSize() const;
+
+void SetText( const OUString rT );
+void SetLines( sal_uInt8 nL );
+void SetDistance( sal_uInt16 nD );
+void SetValues( const String rText, sal_uInt8 nLines, sal_uInt16

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 63616, which changed state.

Bug 63616 Summary: Vertical ruler is unreadable
https://bugs.freedesktop.org/show_bug.cgi?id=63616

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
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 'libreoffice-4-1' - writerfilter/source

2013-06-19 Thread David Tardon 
 writerfilter/source/rtftok/rtffly.hxx |   42 --
 1 file changed, 15 insertions(+), 27 deletions(-)

New commits:
commit b936dd27904f8688214a2e3ac7e1fd5cdf6a0877
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 12:38:43 2013 +0200

fix rtf import on big endian

(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6)

Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4354
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/writerfilter/source/rtftok/rtffly.hxx 
b/writerfilter/source/rtftok/rtffly.hxx
index ab68cfc..d07a8ac 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -17,18 +17,18 @@ namespace writerfilter {
 {
 public:
 RTFVertOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -71,19 +71,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 
 /// Stores the horizontal orientation properties of an RTF fly frame.
@@ -91,18 +83,23 @@ namespace writerfilter {
 {
 public:
 RTFHoriOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_LONIBBLE(OSL_HIBYTE(nVal));
+}
+
+sal_uInt16 GetRelAnchor() const
+{
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -151,20 +148,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelAnchor : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 } // namespace rtftok
 } // namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread David Tardon 
 writerfilter/source/rtftok/rtffly.hxx |   42 --
 1 file changed, 15 insertions(+), 27 deletions(-)

New commits:
commit 593b0352d22d775b5646eaf4928863fbb5a40aea
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 12:38:43 2013 +0200

fix rtf import on big endian

(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6)

Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4355
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/writerfilter/source/rtftok/rtffly.hxx 
b/writerfilter/source/rtftok/rtffly.hxx
index 918f800..f804b00 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -36,18 +36,18 @@ namespace writerfilter {
 {
 public:
 RTFVertOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -90,19 +90,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 
 /// Stores the horizontal orientation properties of an RTF fly frame.
@@ -110,18 +102,23 @@ namespace writerfilter {
 {
 public:
 RTFHoriOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_LONIBBLE(OSL_HIBYTE(nVal));
+}
+
+sal_uInt16 GetRelAnchor() const
+{
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -170,20 +167,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelAnchor : 4;
-sal_uInt16 nRelOrient : 4;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 } // namespace rtftok
 } // namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Triage Contest

2013-06-19 Thread Joel Madero 

Hi All!

Contest is starting in just a few hours. If there are any questions 
please don't hesitate to ask, I'll be in the chat room quite frequently 
over the next couple weeks, always available to help if I'm in there.


Again here is the link for the contest: 
https://wiki.documentfoundation.org/QA/Projects/Bug_Triage_Contest



Warm Regards,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-06-19 Thread Takeshi Abe 
 vcl/source/window/dlgctrl.cxx  |6 +++---
 vcl/source/window/dockmgr.cxx  |   34 +-
 vcl/source/window/dockwin.cxx  |   12 ++--
 vcl/source/window/floatwin.cxx |   16 
 vcl/source/window/keycod.cxx   |2 +-
 vcl/source/window/layout.cxx   |4 ++--
 vcl/source/window/menu.cxx |4 ++--
 vcl/source/window/mnemonic.cxx |4 ++--
 vcl/source/window/scrwnd.cxx   |   14 +++---
 9 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 1ae19c8e6a1651748eb47cc0b8de3c58503cc7eb
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jun 19 22:39:34 2013 +0900

Mark as static

Change-Id: I09a76b4c6ad0e63663c2628e5ad957d203e0283c

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 78d7e82..be28fff 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -603,9 +603,9 @@ struct ButtonOrder
 int m_nPriority;
 };
 
-int getButtonPriority(const OString rType)
+static int getButtonPriority(const OString rType)
 {
-const size_t N_TYPES = 3;
+static const size_t N_TYPES = 3;
 static const ButtonOrder aDiscardCancelSave[N_TYPES] =
 {
 { /discard, 0 },
commit 913d6fb1cc0f9fa879b330d1322f8a19dfc050aa
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jun 19 22:38:50 2013 +0900

Mark as const

Change-Id: Ib7f8aeeca64868fa2037145613023a6abfef7648

diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 77c38ae..0751697 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -29,7 +29,7 @@
 
 
 // ===
-static sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
+static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
 {
 0, 0, 0, 0,// 
KEYFUNC_DONTKNOW
 KEY_N | KEY_MOD1, 0, 0, 0, // 
KEYFUNC_NEW
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 45ceac4..78afb46 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -279,14 +279,14 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString 
rKey )
 nIndex = rKey.Len();
 if( nIndex = 2 )
 {
-static sal_Unicode cGreaterGreater[] = { 0xFF1E, 
0xFF1E };
+static const sal_Unicode cGreaterGreater[] = { 0xFF1E, 
0xFF1E };
 if ( rKey.EqualsAscii( , nIndex-2, 2 ) ||
 rKey.Equals( cGreaterGreater, nIndex-2, 2 ) )
 nIndex -= 2;
 }
 if( nIndex = 3 )
 {
-static sal_Unicode cDotDotDot[] = { 0xFF0E, 0xFF0E, 
0xFF0E };
+static const sal_Unicode cDotDotDot[] = { 0xFF0E, 
0xFF0E, 0xFF0E };
 if ( rKey.EqualsAscii( ..., nIndex-3, 3 ) ||
 rKey.Equals( cDotDotDot, nIndex-3, 3 ) )
 nIndex -= 3;
commit c974471918bd5aa5719ec703564bdb22c5a33a6e
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jun 19 22:30:49 2013 +0900

sal_Bool to bool

Change-Id: Ic0597f42b6f0a637e0a3fdfa7972cbe67272c65d

diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 11d3739..ad3dc48 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -746,7 +746,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt, 
sal_Bool bKeyInput )
 sal_uInt16  nType;
 sal_uInt16  nGetFocusFlags = GETFOCUS_TAB;
 sal_uInt16  nNewIndex;
-sal_BoolbFormular = sal_False;
+boolbFormular = false;
 
 // Bei Ctrl-Tab erstmal testen, ob zwischen Formularen
 // gesprungen werden soll
@@ -763,7 +763,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt, 
sal_Bool bKeyInput )
 if ( 
pTempWindow-ImplGetWindow()-IsDialogControlStart() )
 {
 if ( iTemp != 0 )
-bFormular = sal_True;
+bFormular = true;
 if ( aKeyCode.IsShift() )
 {
 if ( iTemp = nIndex )
@@ -1140,7 +1140,7 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, 
WindowType nMyType, Window
 {
 // #i100833# MT 2010/02: Group box and fixed lines can also lable a 
fixed text.
 // See tools/options/print for example.
-sal_Bool bThisIsAGroupControl = (nMyType == WINDOW_GROUPBOX) || 
(nMyType == WINDOW_FIXEDLINE);
+bool bThisIsAGroupControl = (nMyType == WINDOW_GROUPBOX) || (nMyType 
== WINDOW_FIXEDLINE);
 // get index,

[Libreoffice-commits] core.git: odk/GeneratedPackage_uno_loader_classes.mk odk/Module_odk.mk odk/Package_uno_loader_classes.mk

2013-06-19 Thread David Tardon 
 odk/GeneratedPackage_uno_loader_classes.mk |   16 
 odk/Module_odk.mk  |2 +-
 odk/Package_uno_loader_classes.mk  |   25 -
 3 files changed, 17 insertions(+), 26 deletions(-)

New commits:
commit 41efa1535827b3dfef66ed4ce6c20e85081fe060
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 16:14:19 2013 +0200

use GeneratedPackage to deliver uno loader classes

This is a workaround for problems with file names containing $ in
gbuild. And it does not matter much in this case, because the classes
are never used during build, so there is no need to have exact
dependencies.

Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0

diff --git a/odk/GeneratedPackage_uno_loader_classes.mk 
b/odk/GeneratedPackage_uno_loader_classes.mk
new file mode 100644
index 000..5c3998f
--- /dev/null
+++ b/odk/GeneratedPackage_uno_loader_classes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call 
gb_CustomTarget_get_workdir,odk/classes)))
+
+$(eval $(call 
gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
+
+$(eval $(call 
gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index d1c68d6..6b35409 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -53,9 +53,9 @@ $(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
CustomTarget_javadoc \
+   GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
Package_javadoc \
-   Package_uno_loader_classes \
Package_unowinreg \
 ))
 endif
diff --git a/odk/Package_uno_loader_classes.mk 
b/odk/Package_uno_loader_classes.mk
deleted file mode 100644
index 86e98a2..000
--- a/odk/Package_uno_loader_classes.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,odk_uno_loader_classes,$(call 
gb_CustomTarget_get_workdir,odk/classes)))
-
-$(eval $(call gb_Package_set_outdir,odk_uno_loader_classes,$(INSTDIR)))
-
-$(eval $(call 
gb_Package_add_files_with_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes,\
-   com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \
-   com/sun/star/lib/loader/InstallationFinder.class \
-   com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \
-   com/sun/star/lib/loader/Loader$$Drain.class \
-   com/sun/star/lib/loader/Loader$$Drain.class \
-   com/sun/star/lib/loader/Loader.class \
-   com/sun/star/lib/loader/WinRegKey.class \
-   com/sun/star/lib/loader/WinRegKeyException.class \
-))
-
-# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unused and bugous border dialog

2013-06-19 Thread Zolnai Tamás 
Hi all,

  I found a dialog which is not used (as I see) and the belonging code
is also bugous. This dialog is SwBorderDlg which has the same ui as the
commonly used Borders tab page (e.g. Format - Paragraph... - Borders).

The dialog can be working but the creation is wrong:
http://opengrok.libreoffice.org/xref/core/sw/source/ui/shells/basesh.cxx#2357
The pointer above show the case into which the progam jump when the dialog
is intented to execute (it seems this code is never executed). In this case
the program decides which type of Borders dialog to execute (table,
frame, paragraph).

Problems:
  -This code does not take a notice of page border (it must be a newer
feature) but open the same dialog as in the case of paragraphs. It is
errornous because the paragraph type has an additional checkbox Merge with
next paragraph.
  -How can the shell decide whether execute the page or the paragraph
specific dialog.
  -I intend to add a new type for character border which make more
indefinit this decision.

I find these commits adding the functionality, but they don't help:
http://cgit.freedesktop.org/libreoffice/core/log/?qt=rangeq=7b0b5cdfe

So the question is that anybody knows what the aim of this dialog or how it
can be used in the future.

Additionally the same bugous decision making appear for background (It
seems it is unused too).
http://opengrok.libreoffice.org/xref/core/sw/source/ui/shells/basesh.cxx#2424

Regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 sfx2/Library_sfx.mk sfx2/source svx/source sw/source sw/uiconfig

2013-06-19 Thread Caolán McNamara 
 cui/source/tabpages/paragrph.cxx   |   29 
 cui/uiconfig/ui/paragalignpage.ui  |  116 -
 cui/uiconfig/ui/paraindentspacing.ui   |   46 ++---
 include/sfx2/dialoghelper.hxx  |   32 +
 sfx2/Library_sfx.mk|1 
 sfx2/source/dialog/dialoghelper.cxx|   59 
 svx/source/dialog/paraprev.cxx |3 
 sw/source/ui/chrdlg/drpcps.cxx |5 +
 sw/uiconfig/swriter/ui/dropcapspage.ui |   64 ++
 9 files changed, 217 insertions(+), 138 deletions(-)

New commits:
commit d3c1c8d7587239abcf5448ee143a61fe54b01422
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:13:04 2013 +0100

expand scheme to share sizes for paragraph dialog preview widgets

Change-Id: Id1ded6828468ff956c83eb57f1da62fd80761b5d

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index e17f61c..a0844d4 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -19,6 +19,7 @@
 
 #include svl/style.hxx
 #include sfx2/app.hxx
+#include sfx2/dialoghelper.hxx
 #include sfx2/objsh.hxx
 #include sfx2/module.hxx
 #include vcl/mnemonic.hxx
@@ -634,34 +635,6 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* 
_pSet )
 return LEAVE_PAGE;
 }
 
-namespace
-{
-//these tab pages both have the same basic layout with a preview on the
-//right, get both of their non-preview areas to request the same size
-//so that the preview appears in the same place in each one so
-//flipping between tabs isn't distracting as it jumps around
-void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage)
-{
-for (Window* pChild = pParent-GetWindow(WINDOW_FIRSTCHILD); pChild;
-pChild = pChild-GetWindow(WINDOW_NEXT))
-{
-VclBuilderContainer *pPeer = 
dynamic_castVclBuilderContainer*(pChild);
-if (pPeer != pPage  pPeer-hasBuilder())
-{
-Window *pOtherGrid = pPeer-getWindow(maingrid);
-Window *pOurGrid = pPage-getWindow(maingrid);
-if (pOtherGrid  pOurGrid)
-{
-boost::shared_ptr VclSizeGroup  xGroup(new VclSizeGroup);
-pOtherGrid-add_to_size_group(xGroup);
-pOurGrid-add_to_size_group(xGroup);
-}
-}
-}
-}
-}
-
-
 // ---
 
 SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,  const 
SfxItemSet rAttr ) :
diff --git a/cui/uiconfig/ui/paragalignpage.ui 
b/cui/uiconfig/ui/paragalignpage.ui
index 68238bc..920832d 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -2,6 +2,62 @@
 interface
   !-- interface-requires gtk+ 3.0 --
   !-- interface-requires LibreOffice 1.0 --
+  object class=GtkListStore id=liststoreLB_LASTLINE
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+  !-- column-name guint1 --
+  column type=guint/
+/columns
+data
+  row
+col id=0 translatable=yesDefault/col
+col id=10/col
+  /row
+  row
+col id=0 translatable=yesLeft/col
+col id=11/col
+  /row
+  row
+col id=0 translatable=yesCentered/col
+col id=12/col
+  /row
+  row
+col id=0 translatable=yesJustified/col
+col id=13/col
+  /row
+/data
+  /object
+  object class=GtkListStore id=liststoreLB_VERTALIGN
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+  !-- column-name guint1 --
+  column type=guint/
+/columns
+data
+  row
+col id=0 translatable=yesAutomatic/col
+col id=10/col
+  /row
+  row
+col id=0 translatable=yesBase line/col
+col id=11/col
+  /row
+  row
+col id=0 translatable=yesTop/col
+col id=12/col
+  /row
+  row
+col id=0 translatable=yesMiddle/col
+col id=13/col
+  /row
+  row
+col id=0 translatable=yesBottom/col
+col id=14/col
+  /row
+/data
+  /object
   object class=GtkGrid id=ParaAlignPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -14,17 +70,15 @@
   object class=GtkAlignment id=alignment4
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_top24/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=top_padding24/property
 child
   object class=svxlo-SvxParaPrevWindow id=drawingareaWN_EXAMPLE
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=haligncenter/property
 property name=valignstart/property
-

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

2013-06-19 Thread László Németh 
 sw/source/ui/dialog/uiregionsw.cxx |   26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 5a246765fced0099ae9071c8df98636638ee0b18
Author: László Németh nem...@numbertext.org
Date:   Wed Jun 19 12:11:10 2013 +0200

fdo#65666 keep tabs in footnote settings of sections (backport)

Change-Id: I7dc2f54e6e3a83de59e20fd568b46a3b25fb6b66
Reviewed-on: https://gerrit.libreoffice.org/4353
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index 7f476f1..a195847 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1969,11 +1969,16 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( 
SfxItemSet rSet )
 switch( aFtn.GetValue() )
 {
 case FTNEND_ATTXTEND_OWNNUMANDFMT:
+  {
 aFtn.SetNumType( aFtnNumViewBox.GetSelectedNumberingType() );
-aFtn.SetPrefix( aFtnPrefixED.GetText() );
-aFtn.SetSuffix( aFtnSuffixED.GetText() );
+String aPrefix( aFtnPrefixED.GetText() );
+aPrefix.SearchAndReplaceAllAscii(\\t, '\t'); // fdo#65666
+aFtn.SetPrefix( aPrefix );
+String aSuffix( aFtnSuffixED.GetText() );
+aSuffix.SearchAndReplaceAllAscii(\\t, '\t');
+aFtn.SetSuffix( aSuffix );
 // no break;
-
+  }
 case FTNEND_ATTXTEND_OWNNUMSEQ:
 aFtn.SetOffset( static_cast sal_uInt16 ( aFtnOffsetFld.GetValue()-1 
) );
 // no break;
@@ -1990,11 +1995,16 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( 
SfxItemSet rSet )
 switch( aEnd.GetValue() )
 {
 case FTNEND_ATTXTEND_OWNNUMANDFMT:
+  {
 aEnd.SetNumType( aEndNumViewBox.GetSelectedNumberingType() );
-aEnd.SetPrefix( aEndPrefixED.GetText() );
-aEnd.SetSuffix( aEndSuffixED.GetText() );
+String aPrefix( aEndPrefixED.GetText() );
+aPrefix.SearchAndReplaceAllAscii(\\t, '\t');
+aEnd.SetPrefix( aPrefix );
+String aSuffix( aEndSuffixED.GetText() );
+aSuffix.SearchAndReplaceAllAscii(\\t, '\t');
+aEnd.SetSuffix( aSuffix );
 // no break;
-
+  }
 case FTNEND_ATTXTEND_OWNNUMSEQ:
 aEnd.SetOffset( static_cast sal_uInt16 ( aEndOffsetFld.GetValue()-1 
) );
 // no break;
@@ -2061,8 +2071,8 @@ void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn,
 
 pNumViewBox-SelectNumberingType( rAttr.GetNumType() );
 pOffsetFld-SetValue( rAttr.GetOffset() + 1 );
-pPrefixED-SetText( rAttr.GetPrefix() );
-pSuffixED-SetText( rAttr.GetSuffix() );
+pPrefixED-SetText( rAttr.GetPrefix().replaceAll(\t, \\t) );
+pSuffixED-SetText( rAttr.GetSuffix().replaceAll(\t, \\t) );
 
 switch( eState )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - writerfilter/source

2013-06-19 Thread David Tardon 
 writerfilter/source/rtftok/rtffly.hxx |   42 --
 1 file changed, 15 insertions(+), 27 deletions(-)

New commits:
commit b1927a686c74287bb0d0356818700e019714b59d
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 12:38:43 2013 +0200

fix rtf import on big endian

(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6)

Signed-off-by: David Tardon dtar...@redhat.com

Conflicts:
writerfilter/source/rtftok/rtffly.hxx

Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
Reviewed-on: https://gerrit.libreoffice.org/4356
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/writerfilter/source/rtftok/rtffly.hxx 
b/writerfilter/source/rtftok/rtffly.hxx
index 8922524..6f99130 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -35,18 +35,18 @@ namespace writerfilter {
 {
 public:
 RTFVertOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -89,19 +89,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelOrient : 1;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 
 /// Stores the horizontal orientation properties of an RTF fly frame.
@@ -109,18 +101,23 @@ namespace writerfilter {
 {
 public:
 RTFHoriOrient(sal_uInt16 nValue)
+: nVal(nValue)
 {
-Value.nVal = nValue;
 }
 
 sal_uInt16 GetOrient() const
 {
-return Value.Flags.nOrient;
+return OSL_LONIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_uInt16 GetRelation() const
 {
-return Value.Flags.nRelOrient;
+return OSL_LONIBBLE(OSL_HIBYTE(nVal));
+}
+
+sal_uInt16 GetRelAnchor() const
+{
+return OSL_HINIBBLE(OSL_LOBYTE(nVal));
 }
 
 sal_Int32 GetAlign() const
@@ -169,20 +166,11 @@ namespace writerfilter {
 
 sal_uInt16 GetValue() const
 {
-return Value.nVal;
+return nVal;
 }
 
 private:
-union
-{
-struct
-{
-sal_uInt16 nOrient : 4;
-sal_uInt16 nRelAnchor : 4;
-sal_uInt16 nRelOrient : 1;
-} Flags;
-sal_uInt16 nVal;
-} Value;
+sal_uInt16 nVal;
 };
 } // namespace rtftok
 } // namespace writerfilter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Caolán McNamara 
 helpers/help_hid.lst|8 
 source/text/swriter/01/05030400.xhp |   32 
 2 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit fd638f9abaea98e5a5f788b24faedc45fe01ec1e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:22:51 2013 +0100

update help ids for drop caps .ui conversion

Change-Id: I9faf09609747ac4f4b949bb4a3d4663718b7de67

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2a7e2f7..01f0637 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1494,7 +1494,6 @@ HID_DOCLINKEDIT_URL,38975,
 HID_DOCUMENT_CREATE_REPWIZ,38995,
 HID_DRAW_TEXT_TOOLBOX,54835,
 HID_DRAW_TOOLBOX,54832,
-HID_DROPCAPS,53168,
 HID_DSADMIN_ADVANCED,39016,
 HID_DSADMIN_ALLOWLONG,38813,
 HID_DSADMIN_ALL_TABLES,38823,
@@ -7946,8 +7945,6 @@ sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
 sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION,1427145778,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_CONDCOLL_CB_CONDITION,878445569,
-sw_CheckBox_TP_DROPCAPS_CB_SWITCH,877822989,
-sw_CheckBox_TP_DROPCAPS_CB_WORD,877822992,
 sw_CheckBox_TP_ENV_ENV_BOX_SEND,909640714,
 sw_CheckBox_TP_FLD_DOKINF_CB_DOKINFFIXEDCONTENT,878724117,
 sw_CheckBox_TP_FLD_DOK_CB_DOKFIXEDCONTENT,878756922,
@@ -8092,7 +8089,6 @@ sw_Edit_TP_BUSINESS_DATA_ED_STATE,879233077,
 sw_Edit_TP_BUSINESS_DATA_ED_STREET,879233060,
 sw_Edit_TP_BUSINESS_DATA_ED_WWW,879233075,
 sw_Edit_TP_BUSINESS_DATA_ED_ZIP,879233062,
-sw_Edit_TP_DROPCAPS_EDT_TEXT,877824009,
 sw_Edit_TP_FLD_DB_ED_DBCONDITION,878708744,
 sw_Edit_TP_FLD_DB_ED_DBSETNUMBER,878708745,
 sw_Edit_TP_FLD_DOK_ED_DOKVALUE,878757943,
@@ -8211,7 +8207,6 @@ sw_ListBox_DLG_MULTMRK_LB_TOX,1433456132,
 sw_ListBox_DLG_SEL_GLOS_LB_GLOS,1436749313,
 sw_ListBox_TP_CONDCOLL_LB_FILTER,878448136,
 sw_ListBox_TP_CONDCOLL_LB_STYLE,878448135,
-sw_ListBox_TP_DROPCAPS_BOX_TEMPLATE,877825547,
 sw_ListBox_TP_ENV_ENV_LB_DATABASE,909643268,
 sw_ListBox_TP_ENV_ENV_LB_DBFIELD,909643273,
 sw_ListBox_TP_ENV_ENV_LB_TABLE,909643270,
@@ -8314,7 +8309,6 @@ 
sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_RMARGIN,1411291663,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_TMARGIN,1411291665,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_VMARGIN,1411291671,
 sw_MetricField_DLG_ROW_HEIGHT_ED_HEIGHT,1425250817,
-sw_MetricField_TP_DROPCAPS_FLD_DISTANCE,877828614,
 sw_MetricField_TP_ENV_FMT_FLD_ADDR_LEFT,909662734,
 sw_MetricField_TP_ENV_FMT_FLD_ADDR_TOP,909662736,
 sw_MetricField_TP_ENV_FMT_FLD_SEND_LEFT,909662744,
@@ -8382,8 +8376,6 @@ 
sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD,898275333,
 sw_NumericField_DLG_MM_SERVERAUTHENTICATION_NF_PORT,1427150861,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
-sw_NumericField_TP_DROPCAPS_FLD_DROPCAPS,877828098,
-sw_NumericField_TP_DROPCAPS_FLD_LINES,877828100,
 sw_NumericField_TP_FLD_DOK_ED_DOKDATEOFF,878762041,
 sw_NumericField_TP_FLD_DOK_ED_DOKLEVEL,878762040,
 sw_NumericField_TP_LAB_FMT_FLD_COLUMNS,909711375,
diff --git a/source/text/swriter/01/05030400.xhp 
b/source/text/swriter/01/05030400.xhp
index 5763cd8..27d2b3d 100644
--- a/source/text/swriter/01/05030400.xhp
+++ b/source/text/swriter/01/05030400.xhp
@@ -36,36 +36,36 @@
 bookmark_valuecapital letters;starting paragraphs/bookmark_value
 bookmark_valuedrop caps insertion/bookmark_value
 /bookmark
-bookmark xml-lang=en-US branch=hid/SW_HID_DROPCAPS id=bm_id3151239 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/dropcapspage/DropCapPage id=bm_id3151239 
localize=false/
 paragraph role=heading id=hd_id3150252 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/swriter/01/05030400.xhp name=Drop 
CapsDrop Caps/link/paragraph
-paragraph role=paragraph id=par_id3154763 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=HID_DROPCAPSFormats the first letter of a paragraph 
with a large capital letter, that can span several lines. The paragraph must 
span at least as many lines as you specify in the Lines box./ahelp/paragraph
+paragraph role=paragraph id=par_id3154763 xml-lang=en-US l10n=CHG 
oldref=2ahelp hid=modules/swriter/ui/dropcapspage/DropCapPageFormats the 
first letter of a paragraph with a large capital letter, that can span several 
lines. The paragraph must span at least as many lines as you specify in the 
Lines box./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/swriter/00/0405.xhp#initialen/
 /section
 paragraph role=heading id=hd_id3151388 xml-lang=en-US level=2 
l10n=U oldref=3Settings/paragraph
-bookmark xml-lang=en-US branch=hid/sw:CheckBox:TP_DROPCAPS:CB_SWITCH 
id=bm_id3146322 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/dropcapspage/checkCB_SWITCH id=bm_id3146322 
localize=false/
 paragraph role=heading id=hd_id3147295 xml-lang=en-US level=3 
l10n=U oldref=5Show Drop Caps/paragraph
-paragraph role=paragraph

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc

2013-06-19 Thread Caolán McNamara 
 helpcontent2|2 +-
 sw/inc/helpid.h |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 650eaad6cee4211d15f7d5e91ef70d482205228e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:23:06 2013 +0100

drop unused helpids

Change-Id: Ic2cb501330b7c05b303750152619c4b4abb0

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 1ea0ffc..c437da1 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -142,7 +142,6 @@
 
 // TabPage Help-IDs
 
-#define HID_DROPCAPS
SW_HID_DROPCAPS
 #define HID_FRM_EXT 
SW_HID_FRM_EXT
 #define HID_FRM_STD 
SW_HID_FRM_STD
 #define HID_GRF_EXT 
SW_HID_GRF_EXT
commit 03e93ba2bcaf6425eaffa32379f227ea7265d39e
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:22:51 2013 +0100

Updated core
Project: help  fd638f9abaea98e5a5f788b24faedc45fe01ec1e

diff --git a/helpcontent2 b/helpcontent2
index d6621f9..fd638f9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d6621f90fda77c1d2232f511f42b3ed0dc38ac68
+Subproject commit fd638f9abaea98e5a5f788b24faedc45fe01ec1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Armin Le Grand 
 sc/source/ui/view/gridwin.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit aaf3ff8adf0821090ba4cc9043e7f3a1ce1f6033
Author: Armin Le Grand a...@apache.org
Date:   Wed Jun 19 11:23:41 2013 +

Resolves: #i122497# Filter DD flags for calc DD

(cherry picked from commit 73a9e800ff4f61058750acb6840af780a0505b49)

Change-Id: I47975b23d7ef920de24f92d6ba12bae1233b2f38

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 244a731..7afbab1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3704,6 +3704,13 @@ sal_Int8 ScGridWindow::AcceptDrop( const 
AcceptDropEvent rEvt )
 {
 sal_Int8 nMyAction = rEvt.mnAction;
 
+// clear DND_ACTION_LINK when other actions are set. The usage 
below cannot handle
+// multiple set values
+if((nMyAction  DND_ACTION_LINK)  (nMyAction  
(DND_ACTION_COPYMOVE)))
+{
+nMyAction = ~DND_ACTION_LINK;
+}
+
 if ( !rData.pDrawTransfer ||
 !IsMyModel(rData.pDrawTransfer-GetDragSourceView()) ) 
 // drawing within the document
 if ( rEvt.mbDefault  nMyAction == DND_ACTION_MOVE )
@@ -3712,7 +3719,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent 
rEvt )
 ScDocument* pThisDoc = pViewData-GetDocument();
 SdrObject* pHitObj = pThisDoc-GetObjectAtPoint(
 pViewData-GetTabNo(), PixelToLogic(rEvt.maPosPixel) );
-if ( pHitObj  nMyAction == DND_ACTION_LINK  
!rData.pDrawTransfer )
+if ( pHitObj  nMyAction == DND_ACTION_LINK ) //  
!rData.pDrawTransfer )
 {
 if ( IsDropFormatSupported(SOT_FORMATSTR_ID_SVXB)
 || IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE)
@@ -4334,8 +4341,9 @@ sal_Int8 ScGridWindow::ExecuteDrop( const 
ExecuteDropEvent rEvt )
 }
 
 Point aLogicPos = PixelToLogic(aPos);
+sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
 
-if (rData.pDrawTransfer)
+if (!bIsLink  rData.pDrawTransfer)
 {
 sal_uInt16 nFlags = rData.pDrawTransfer-GetDragSourceFlags();
 
@@ -4371,8 +4379,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const 
ExecuteDropEvent rEvt )
 }
 }
 
-sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
-
 ScDocument* pThisDoc = pViewData-GetDocument();
 SdrObject* pHitObj = pThisDoc-GetObjectAtPoint( pViewData-GetTabNo(), 
PixelToLogic(aPos) );
 if ( pHitObj  bIsLink )
___
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' - 73/a9e800ff4f61058750acb6840af780a0505b49

2013-06-19 Thread Caolán McNamara 
 73/a9e800ff4f61058750acb6840af780a0505b49 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61fcf1bbd04b02806270f32c4b4f36ab646559c6
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:34:56 2013 +0100

Notes added by 'git notes add'

diff --git a/73/a9e800ff4f61058750acb6840af780a0505b49 
b/73/a9e800ff4f61058750acb6840af780a0505b49
new file mode 100644
index 000..728db52
--- /dev/null
+++ b/73/a9e800ff4f61058750acb6840af780a0505b49
@@ -0,0 +1 @@
+merged as: aaf3ff8adf0821090ba4cc9043e7f3a1ce1f6033
___
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' - 91/4cb68eed75ee8aa38fbf48d029057a66a21f30

2013-06-19 Thread Caolán McNamara 
 91/4cb68eed75ee8aa38fbf48d029057a66a21f30 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fb2bba94baf10cd35dd852063bd332f31f29f63b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:39:56 2013 +0100

Notes added by 'git notes add'

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

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

2013-06-19 Thread Ariel Constenla-Haile 
 sfx2/source/doc/printhelper.cxx |   47 +++-
 1 file changed, 23 insertions(+), 24 deletions(-)

New commits:
commit bf4ecd6138f07ca6207eeec306517eff4aff220e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Feb 24 18:23:09 2013 +

Resolves: fdo#65908 #i114817# missing PrintableState_JOB_STARTED 
notification

(cherry picked from commit 914cb68eed75ee8aa38fbf48d029057a66a21f30)

Change-Id: Icb7c304b856cfca7f80090c2d193a0b92a27bb30

diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e55276b..1b00652 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -789,32 +789,31 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence 
beans::PropertyValue 
 
 void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster rBC, const 
SfxHint rHint )
 {
-if ( rBC == m_pObjectShell )
+SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, rHint );
+if ( rBC != m_pObjectShell
+|| !pPrintHint
+|| pPrintHint-GetWhich() == -2 ) // -2 : CancelPrintJob
+return;
+
+if ( pPrintHint-GetWhich() == 
com::sun::star::view::PrintableState_JOB_STARTED )
 {
-SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, rHint );
-if ( pPrintHint )
-{
-if ( pPrintHint-GetWhich() == 
com::sun::star::view::PrintableState_JOB_STARTED )
-{
-if ( !m_xPrintJob.is() )
-m_xPrintJob = new SfxPrintJob_Impl( this );
-m_aPrintOptions = pPrintHint-GetOptions();
-}
-else if ( pPrintHint-GetWhich() != -2 )// -2 : CancelPrintJob
-{
-view::PrintJobEvent aEvent;
-aEvent.Source = m_xPrintJob;
-aEvent.State = (com::sun::star::view::PrintableState) 
pPrintHint-GetWhich();
-::cppu::OInterfaceContainerHelper* pContainer = 
m_aInterfaceContainer.getContainer( ::getCppuType( ( const uno::Reference 
view::XPrintJobListener *) NULL ) );
-if ( pContainer!=NULL )
-{
-::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
-while (pIterator.hasMoreElements())
-
((view::XPrintJobListener*)pIterator.next())-printJobEvent( aEvent );
-}
-}
-}
+if ( !m_xPrintJob.is() )
+m_xPrintJob = new SfxPrintJob_Impl( this );
+m_aPrintOptions = pPrintHint-GetOptions();
 }
+
+::cppu::OInterfaceContainerHelper* pContainer = 
m_aInterfaceContainer.getContainer(
+::getCppuType( ( const uno::Reference view::XPrintJobListener *) 
NULL ) );
+if ( !pContainer )
+return;
+
+view::PrintJobEvent aEvent;
+aEvent.Source = m_xPrintJob;
+aEvent.State = (com::sun::star::view::PrintableState) 
pPrintHint-GetWhich();
+
+::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+while (pIterator.hasMoreElements())
+((view::XPrintJobListener*)pIterator.next())-printJobEvent( aEvent );
 }
 
 void SAL_CALL SfxPrintHelper::addPrintJobListener( const 
::com::sun::star::uno::Reference ::com::sun::star::view::XPrintJobListener  
xListener ) throw (::com::sun::star::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - odk/GeneratedPackage_uno_loader_classes.mk odk/Module_odk.mk odk/Package_uno_loader_classes.mk

2013-06-19 Thread David Tardon 
 odk/GeneratedPackage_uno_loader_classes.mk |   16 
 odk/Module_odk.mk  |2 +-
 odk/Package_uno_loader_classes.mk  |   25 -
 3 files changed, 17 insertions(+), 26 deletions(-)

New commits:
commit 94cf00b065ba9f72455e706e066ced57d31ba0d8
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 16:14:19 2013 +0200

use GeneratedPackage to deliver uno loader classes

This is a workaround for problems with file names containing $ in
gbuild. And it does not matter much in this case, because the classes
are never used during build, so there is no need to have exact
dependencies.

Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0
(cherry picked from commit 41efa1535827b3dfef66ed4ce6c20e85081fe060)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/odk/GeneratedPackage_uno_loader_classes.mk 
b/odk/GeneratedPackage_uno_loader_classes.mk
new file mode 100644
index 000..5c3998f
--- /dev/null
+++ b/odk/GeneratedPackage_uno_loader_classes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call 
gb_CustomTarget_get_workdir,odk/classes)))
+
+$(eval $(call 
gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
+
+$(eval $(call 
gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index f7cc777..87cc7b9 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -56,9 +56,9 @@ $(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
CustomTarget_javadoc \
+   GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
Package_javadoc \
-   Package_uno_loader_classes \
Package_unowinreg \
 ))
 endif
diff --git a/odk/Package_uno_loader_classes.mk 
b/odk/Package_uno_loader_classes.mk
deleted file mode 100644
index 86e98a2..000
--- a/odk/Package_uno_loader_classes.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,odk_uno_loader_classes,$(call 
gb_CustomTarget_get_workdir,odk/classes)))
-
-$(eval $(call gb_Package_set_outdir,odk_uno_loader_classes,$(INSTDIR)))
-
-$(eval $(call 
gb_Package_add_files_with_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes,\
-   com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \
-   com/sun/star/lib/loader/InstallationFinder.class \
-   com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \
-   com/sun/star/lib/loader/Loader$$Drain.class \
-   com/sun/star/lib/loader/Loader$$Drain.class \
-   com/sun/star/lib/loader/Loader.class \
-   com/sun/star/lib/loader/WinRegKey.class \
-   com/sun/star/lib/loader/WinRegKeyException.class \
-))
-
-# vim: set noet sw=4 ts=4:
___
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' - 1b/fae56dd9d633a80924bfeefc03368100d75a8f

2013-06-19 Thread Caolán McNamara 
 1b/fae56dd9d633a80924bfeefc03368100d75a8f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit abac0fe4b8208a37c440f1916ee684071211d1d6
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 16:00:27 2013 +0100

Notes added by 'git notes add'

diff --git a/1b/fae56dd9d633a80924bfeefc03368100d75a8f 
b/1b/fae56dd9d633a80924bfeefc03368100d75a8f
new file mode 100644
index 000..891b4f8
--- /dev/null
+++ b/1b/fae56dd9d633a80924bfeefc03368100d75a8f
@@ -0,0 +1 @@
+merged as: 87dfa6dd336d596112c0beb6b42f082178461678
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sw/qa

2013-06-19 Thread Caolán McNamara 
 include/sfx2/event.hxx   |   54 ---
 sfx2/source/doc/printhelper.cxx  |6 ++-
 sfx2/source/view/viewprn.cxx |   13 +--
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 +-
 4 files changed, 50 insertions(+), 27 deletions(-)

New commits:
commit db20a50fab35c15baf55f0146ed0cb80527053e8
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 15:52:25 2013 +0100

sal_Int32 as long on 32bit, how we hate thee

Change-Id: I702509c7ad9dd3e84feb6d880264df36afe3c5b3

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3dbb0a4..133cf6e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -823,7 +823,7 @@ void Test::testFdo64238_a()
 uno::Reference text::XTextRange  xFooterParagraph = getParagraphOfText( 
1, xFooterText );
 uno::Referencecontainer::XEnumerationAccess 
xRunEnumAccess(xFooterParagraph, uno::UNO_QUERY);
 uno::Referencecontainer::XEnumeration xRunEnum = 
xRunEnumAccess-createEnumeration();
-int numOfRuns = 0;
+sal_Int32 numOfRuns = 0;
 while (xRunEnum-hasMoreElements())
 {
 uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(), 
uno::UNO_QUERY);
@@ -843,7 +843,7 @@ void Test::testFdo64238_b()
 uno::Reference text::XTextRange  xFooterParagraph = getParagraphOfText( 
1, xFooterText );
 uno::Referencecontainer::XEnumerationAccess 
xRunEnumAccess(xFooterParagraph, uno::UNO_QUERY);
 uno::Referencecontainer::XEnumeration xRunEnum = 
xRunEnumAccess-createEnumeration();
-int numOfRuns = 0;
+sal_Int32 numOfRuns = 0;
 while (xRunEnum-hasMoreElements())
 {
 uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(), 
uno::UNO_QUERY);
commit 87dfa6dd336d596112c0beb6b42f082178461678
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sun Feb 24 18:23:21 2013 +

Resolves: #i121810# Adapt SfxPrintingHint to work with...

the new XDocumentEventBroadcaster

(cherry picked from commit 1bfae56dd9d633a80924bfeefc03368100d75a8f)

Conflicts:
sfx2/inc/sfx2/event.hxx
sfx2/source/view/viewprn.cxx

Change-Id: I6b3e1edc396b82d85fe059e6cdf7ad0009d5b94b

diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index bcdc88e..6993185 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -21,6 +21,7 @@
 
 #include sal/config.h
 #include sfx2/dllapi.h
+#include sfx2/sfx.hrc
 #include tools/string.hxx
 #include svl/hint.hxx
 #include unotools/eventcfg.hxx
@@ -29,6 +30,9 @@
 #include com/sun/star/uno/Sequence.hxx
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/frame/XController2.hpp
+#include com/sun/star/view/PrintableState.hpp
+
+namespace css = ::com::sun::star;
 
 class SfxObjectShell;
 
@@ -62,22 +66,22 @@ public:
 
 class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
 {
-::com::sun::star::uno::Reference ::com::sun::star::frame::XController2  
xViewController;
+::com::sun::star::uno::Reference css::frame::XController2  
xViewController;
 
 public:
 TYPEINFO();
 
-SfxViewEventHint( sal_uInt16 nId, const OUString aName, SfxObjectShell 
*pObj, const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XController  xController )
+SfxViewEventHint( sal_uInt16 nId, const OUString aName, SfxObjectShell 
*pObj, const css::uno::Reference css::frame::XController  xController )
 : SfxEventHint( nId, aName, pObj )
-, xViewController( xController, 
::com::sun::star::uno::UNO_QUERY )
+, xViewController( xController, css::uno::UNO_QUERY )
 {}
 
-SfxViewEventHint( sal_uInt16 nId, const OUString aName, SfxObjectShell 
*pObj, const ::com::sun::star::uno::Reference 
::com::sun::star::frame::XController2  xController )
+SfxViewEventHint( sal_uInt16 nId, const OUString aName, SfxObjectShell 
*pObj, const css::uno::Reference css::frame::XController2  xController )
 : SfxEventHint( nId, aName, pObj )
 , xViewController( xController )
 {}
 
-::com::sun::star::uno::Reference ::com::sun::star::frame::XController2  
GetController() const
+css::uno::Reference css::frame::XController2  GetController() const
 { return xViewController; }
 };
 
@@ -112,23 +116,35 @@ public:
 };
 
 class Printer;
-class SfxPrintingHint : public SfxHint
+
+class SfxPrintingHint : public SfxViewEventHint
 {
-sal_Int32   nWhich;
+sal_Int32 mnPrintableState;
 com::sun::star::uno::Sequence  com::sun::star::beans::PropertyValue  
aOpts;
 public:
-TYPEINFO();
-SfxPrintingHint( sal_Int32 nEvent, const 
com::sun::star::uno::Sequence  com::sun::star::beans::PropertyValue  rOpts )
-: nWhich(

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

2013-06-19 Thread David Tardon 
 svx/source/svdraw/svdedtv1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a2aa293069220dc75b3d835f691f378bc193ed17
Author: David Tardon dtar...@redhat.com
Date:   Wed Jun 19 14:23:44 2013 +0200

fdo#65870 fix changing shape height via dialog

(cherry picked from commit 8c1d1b66904cdd95e8eec746a81cf1c57ad0e85a)

Change-Id: I7c61be2c3d368dfd3ea66427c77636f797a7e88a
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4362
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 196779b..85ea67d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1522,6 +1522,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet 
rAttr)
 if 
(SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,pPoolItem))
 {
 nSizY=((const SfxUInt32Item*)pPoolItem)-GetValue();
 bChgSiz=true;
+bChgHgt=true;
 }
 if (bChgSiz) {
 eSizePoint=(RECT_POINT)((const 
SfxAllEnumItem)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-29'

2013-06-19 Thread Andras Timar 
Tag 'suse-3.6-29' created by Andras Timar ati...@suse.com at 2013-06-19 16:05 
-0700

suse-3.6-29

Changes since suse-3.6-28-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-29'

2013-06-19 Thread Petr Mladek 
Tag 'suse-3.6-29' created by Andras Timar ati...@suse.com at 2013-06-19 16:05 
-0700

suse-3.6-29

Changes since suse-3.6-12:
Andras Timar (3):
  updated pt-PT spelling dictionary
  fdo#56130 update Galician dictionary pack
  Update pt-PT dictionary

Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Lior Kaplan (1):
  Update Hebrew dictionary to one created with Hspell 1.2 (taken from 
Fedora 17 64bit)

Olivier Hallot (1):
  Fix for fdo#53520, Portuguese spelling files

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 dictionaries/pt_PT/description.xml |2 
 dictionaries/pt_PT/pt_PT.dic   |  257 -
 2 files changed, 144 insertions(+), 115 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-29'

2013-06-19 Thread Andras Timar 
Tag 'suse-3.6-29' created by Andras Timar ati...@suse.com at 2013-06-19 16:05 
-0700

suse-3.6-29

Changes since suse-3.6-0-3:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread Matteo Casalin 
 sw/source/ui/docvw/edtwin.cxx |   26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 4bb1b555c533493799d780f18c1ab602677ef88a
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Jun 9 13:17:42 2013 +0200

Rework code after OUString'ification

Change-Id: Ic93472b0621a13a777d37cfacc4230630f88a6ac
Reviewed-on: https://gerrit.libreoffice.org/4214
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 60b7c8b..d72b270 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -861,26 +861,25 @@ void SwEditWin::FlushInBuffer()
 if (!rSh.GetCrsr()-HasMark())
 rSh.GetCrsr()-SetMark();
 rSh.GetCrsr()-GetMark()-nContent = 0;
-OUString aLeftText( rSh.GetCrsr()-GetTxt() );
+
+const OUString aOldText( rSh.GetCrsr()-GetTxt() );
+const sal_Int32 nOldLen = aOldText.getLength();
 
 SvtCTLOptions rCTLOptions = SW_MOD()-GetCTLOptions();
 
 xub_StrLen nExpandSelection = 0;
-if (aLeftText.getLength()  0)
+if (nOldLen  0)
 {
-sal_Unicode cChar = '\0';
-
-sal_Int32 nTmpPos = aLeftText.getLength();
+sal_Int32 nTmpPos = nOldLen;
 sal_Int16 nCheckMode = 
rCTLOptions.IsCTLSequenceCheckingRestricted() ?
 i18n::InputSequenceCheckMode::STRICT : 
i18n::InputSequenceCheckMode::BASIC;
 
-OUString aOldText( aLeftText );
 OUString aNewText( aOldText );
 if (rCTLOptions.IsCTLSequenceCheckingTypeAndReplace())
 {
 for (xub_StrLen k = 0;  k  m_aInBuffer.Len();  ++k)
 {
-cChar = m_aInBuffer.GetChar(k);
+const sal_Unicode cChar = m_aInBuffer.GetChar(k);
 const sal_Int32 nPrevPos =xISC-correctInputSequence( 
aNewText, nTmpPos - 1, cChar, nCheckMode );
 
 // valid sequence or sequence could be corrected:
@@ -889,7 +888,6 @@ void SwEditWin::FlushInBuffer()
 }
 
 // find position of first character that has changed
-sal_Int32 nOldLen = aOldText.getLength();
 sal_Int32 nNewLen = aNewText.getLength();
 const sal_Unicode *pOldTxt = aOldText.getStr();
 const sal_Unicode *pNewTxt = aNewText.getStr();
@@ -898,13 +896,11 @@ void SwEditWin::FlushInBuffer()
 pOldTxt[nChgPos] == pNewTxt[nChgPos] )
 ++nChgPos;
 
-xub_StrLen nChgLen = static_cast xub_StrLen (nNewLen - 
nChgPos);
-String aChgText( aNewText.copy( static_cast xub_StrLen 
(nChgPos), nChgLen ) );
-
-if (aChgText.Len())
+const sal_Int32 nChgLen = nNewLen - nChgPos;
+if (nChgLen)
 {
-m_aInBuffer = aChgText;
-nExpandSelection = static_cast xub_StrLen 
(aLeftText.getLength() - nChgPos);
+m_aInBuffer = aNewText.copy( nChgPos, nChgLen );
+nExpandSelection = static_cast xub_StrLen (nOldLen - 
nChgPos);
 }
 else
 m_aInBuffer.Erase();
@@ -913,7 +909,7 @@ void SwEditWin::FlushInBuffer()
 {
 for (xub_StrLen k = 0;  k  m_aInBuffer.Len();  ++k)
 {
-cChar = m_aInBuffer.GetChar(k);
+const sal_Unicode cChar = m_aInBuffer.GetChar(k);
 if (xISC-checkInputSequence( aNewText, nTmpPos - 1, 
cChar, nCheckMode ))
 {
 // character can be inserted:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-29'

2013-06-19 Thread Petr Mladek 
Tag 'suse-3.6-29' created by Andras Timar ati...@suse.com at 2013-06-19 16:05 
-0700

suse-3.6-29

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-29'

2013-06-19 Thread Libreoffice Gerrit user 
Tag 'suse-3.6-29' created by Andras Timar ati...@suse.com at 2013-06-19 16:05 
-0700

suse-3.6-29

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
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/source

2013-06-19 Thread Kohei Yoshida 
 sc/inc/cellclonehandler.hxx  |   17 +++--
 sc/source/core/data/cellclonehandler.cxx |   47 +++---
 sc/source/core/data/column.cxx   |  101 +++
 sc/source/core/data/column2.cxx  |4 +
 sc/source/core/data/column3.cxx  |   18 +
 5 files changed, 120 insertions(+), 67 deletions(-)

New commits:
commit 854176b039e41ba12c56c311699b514b4e625784
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jun 19 11:19:26 2013 -0400

Have the clone handler handle the text attr array as well.

In order to handle the special case of cell removal.

Change-Id: I7782232ce0fe6c0248c40482ec62d909d2dfe621

diff --git a/sc/inc/cellclonehandler.hxx b/sc/inc/cellclonehandler.hxx
index a08383c..4ae8123 100644
--- a/sc/inc/cellclonehandler.hxx
+++ b/sc/inc/cellclonehandler.hxx
@@ -25,32 +25,39 @@ class CellBlockCloneHandler
 ScDocument mrSrcDoc;
 ScDocument mrDestDoc;
 CellStoreType mrDestCellStore;
+CellTextAttrStoreType mrDestAttrStore;
 
 protected:
 ScDocument getSrcDoc();
 ScDocument getDestDoc();
 const ScDocument getDestDoc() const;
 CellStoreType getDestCellStore();
+CellTextAttrStoreType getDestAttrStore();
+
+void setDefaultAttrToDest(ColumnBlockPosition rPos, SCROW nRow);
+void setDefaultAttrsToDest(ColumnBlockPosition rPos, SCROW nRow, size_t 
nSize);
 
 public:
 CellBlockCloneHandler(
-ScDocument rSrcDoc, ScDocument rDestDoc, CellStoreType 
rDestCellStore);
+ScDocument rSrcDoc, ScDocument rDestDoc,
+CellStoreType rDestCellStore, CellTextAttrStoreType rDestAttrStore);
+
 virtual ~CellBlockCloneHandler();
 
 virtual void cloneDoubleBlock(
-CellStoreType::iterator itPos, const ScAddress rSrcPos, const 
ScAddress rDestPos,
+ColumnBlockPosition rPos, const ScAddress rSrcPos, const ScAddress 
rDestPos,
 const numeric_block::const_iterator itBegin, const 
numeric_block::const_iterator itEnd);
 
 virtual void cloneStringBlock(
-CellStoreType::iterator itPos, const ScAddress rSrcPos, const 
ScAddress rDestPos,
+ColumnBlockPosition rPos, const ScAddress rSrcPos, const ScAddress 
rDestPos,
 const string_block::const_iterator itBegin, const 
string_block::const_iterator itEnd);
 
 virtual void cloneEditTextBlock(
-CellStoreType::iterator itPos, const ScAddress rSrcPos, const 
ScAddress rDestPos,
+ColumnBlockPosition rPos, const ScAddress rSrcPos, const ScAddress 
rDestPos,
 const edittext_block::const_iterator itBegin, const 
edittext_block::const_iterator itEnd);
 
 virtual void cloneFormulaBlock(
-CellStoreType::iterator itPos, const ScAddress rSrcPos, const 
ScAddress rDestPos,
+ColumnBlockPosition rPos, const ScAddress rSrcPos, const ScAddress 
rDestPos,
 const formula_block::const_iterator itBegin, const 
formula_block::const_iterator itEnd);
 };
 
diff --git a/sc/source/core/data/cellclonehandler.cxx 
b/sc/source/core/data/cellclonehandler.cxx
index 1f1d75c..8f5bd17 100644
--- a/sc/source/core/data/cellclonehandler.cxx
+++ b/sc/source/core/data/cellclonehandler.cxx
@@ -14,8 +14,10 @@
 namespace sc {
 
 CellBlockCloneHandler::CellBlockCloneHandler(
-ScDocument rSrcDoc, ScDocument rDestDoc, CellStoreType rDestCellStore) :
-mrSrcDoc(rSrcDoc), mrDestDoc(rDestDoc), mrDestCellStore(rDestCellStore) {}
+ScDocument rSrcDoc, ScDocument rDestDoc,
+CellStoreType rDestCellStore, CellTextAttrStoreType rDestAttrStore) :
+mrSrcDoc(rSrcDoc), mrDestDoc(rDestDoc),
+mrDestCellStore(rDestCellStore), mrDestAttrStore(rDestAttrStore) {}
 
 CellBlockCloneHandler::~CellBlockCloneHandler() {}
 
@@ -39,22 +41,41 @@ CellStoreType CellBlockCloneHandler::getDestCellStore()
 return mrDestCellStore;
 }
 
+CellTextAttrStoreType CellBlockCloneHandler::getDestAttrStore()
+{
+return mrDestAttrStore;
+}
+
+void CellBlockCloneHandler::setDefaultAttrToDest(ColumnBlockPosition rPos, 
SCROW nRow)
+{
+rPos.miCellTextAttrPos = mrDestAttrStore.set(rPos.miCellTextAttrPos, nRow, 
CellTextAttr());
+}
+
+void CellBlockCloneHandler::setDefaultAttrsToDest(ColumnBlockPosition rPos, 
SCROW nRow, size_t nSize)
+{
+std::vectorsc::CellTextAttr aAttrs(nSize); // default values
+rPos.miCellTextAttrPos = mrDestAttrStore.set(
+rPos.miCellTextAttrPos, nRow, aAttrs.begin(), aAttrs.end());
+}
+
 void CellBlockCloneHandler::cloneDoubleBlock(
-CellStoreType::iterator itPos, const ScAddress /*rSrcPos*/, const 
ScAddress rDestPos,
+ColumnBlockPosition rPos, const ScAddress /*rSrcPos*/, const ScAddress 
rDestPos,
 const numeric_block::const_iterator itBegin, const 
numeric_block::const_iterator itEnd)
 {
-itPos = mrDestCellStore.set(itPos, rDestPos.Row(), itBegin, itEnd);
+rPos.miCellPos = mrDestCellStore.set(rPos.miCellPos, rDestPos.Row(), 
itBegin, itEnd);
+setDefaultAttrsToDest(rPos, rDestPos.Row(), std::distance(itBegin,

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/inc svx/source

2013-06-19 Thread David Tardon 
 svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx  |3 +++
 svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx |9 +
 svx/source/sdr/contact/viewobjectcontactofgroup.cxx   |9 +
 svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx  |7 ++-
 4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit ff7280bbb169deaaa5b813ba07a7bfdb715a0482
Author: David Tardon dtar...@redhat.com
Date:   Sun Mar 24 14:08:14 2013 +0100

fdo#62617 display groups on multiple layers correctly

It is possible to group objects from different layers, so it is an error
to rely on layer ID when checking visibility of a group. This problem
was partially obscured by the fact that SdrObjGroup::GetLayer() returns
0 if its subobjects are on different layers and 0 is a valid layer ID.

(cherry picked from commit 09d4525b11f396a68ca7c5cbb1ae3462db40c77c)

Change-Id: I0ef75544a26817154642185864cafd4e6734fa38
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4357
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx 
b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
index e189a63..7a0596a 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
@@ -49,6 +49,9 @@ namespace sdr
 
 // This method recursively paints the draw hierarchy.
 virtual drawinglayer::primitive2d::Primitive2DSequence 
getPrimitive2DSequenceHierarchy(DisplayInfo rDisplayInfo) const;
+
+private:
+virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte 
aLayers) const;
 };
 } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx 
b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index e366bbd..e5b1f13 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -34,6 +34,7 @@
 //
 // predeclarations
 class SdrObject;
+class SetOfByte;
 
 //
 
@@ -43,6 +44,14 @@ namespace sdr
 {
 class SVX_DLLPUBLIC ViewObjectContactOfSdrObj : public 
ViewObjectContact
 {
+/** Test whether the primitive is visible on any layer from @c 
aLayers
+
+This should be overriden by ViewObjectContacts of SDR classes
+that have subparts which can be on different layers (that is,
+SdrObjGroup .-)
+  */
+virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte 
aLayers) const;
+
 protected:
 const SdrObject getSdrObject() const;
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx 
b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 3f47bb4..ee2c630 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
@@ -34,6 +34,7 @@
 #include drawinglayer/primitive2d/groupprimitive2d.hxx
 #include basegfx/tools/canvastools.hxx
 #include svx/sdr/contact/viewcontact.hxx
+#include svx/svdobj.hxx
 
 //
 
@@ -107,6 +108,14 @@ namespace sdr
 }
 return xRetval;
 }
+
+bool ViewObjectContactOfGroup::isPrimitiveVisibleOnAnyLayer(const 
SetOfByte aLayers) const
+{
+SetOfByte aObjectLayers;
+getSdrObject().getMergedHierarchyLayerSet(aObjectLayers);
+aObjectLayers = aLayers;
+return !aObjectLayers.IsEmpty();
+}
 } // end of namespace contact
 } // end of namespace sdr
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index d9a285f..b1e9fa9 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -57,12 +57,17 @@ namespace sdr
 {
 }
 
+bool ViewObjectContactOfSdrObj::isPrimitiveVisibleOnAnyLayer(const 
SetOfByte aLayers) const
+{
+return aLayers.IsSet(getSdrObject().GetLayer());
+}
+
 bool ViewObjectContactOfSdrObj::isPrimitiveVisible(const DisplayInfo 
rDisplayInfo) const
 {
 const SdrObject rObject = getSdrObject();
 
 // Test layer visibility
-if(!rDisplayInfo.GetProcessLayers().IsSet(rObject.GetLayer()))
+if(!isPrimitiveVisibleOnAnyLayer(rDisplayInfo.GetProcessLayers()))
 {
 return false;
 }
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: odk/CustomTarget_classes.mk

2013-06-19 Thread Stephan Bergmann 
 odk/CustomTarget_classes.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 5b53053af54bb8fce2a91c0d59929c02dbb1e912
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 19 17:18:00 2013 +0200

Remove unused, broken rule

That rule was broken as it did not quote $@ which could be a pathname 
containing
$, but it is unused anyway since 41efa1535827b3dfef66ed4ce6c20e85081fe060 
use
GeneratedPackage to deliver uno loader classes.

Change-Id: I4e5a15be8e4acca3d5be0c1b228f6c324d12331c

diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index bd07f0a..68666b4 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -22,9 +22,6 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
 ))
 
-$(call gb_CustomTarget_get_workdir,odk/classes)/%.class : $(call 
gb_CustomTarget_get_workdir,odk/classes)/java.done
-   touch $@
-
 $(call gb_CustomTarget_get_workdir,odk/classes)/java.done: $(call 
gb_JavaClassSet_get_target,loader)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@)  \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

2013-06-19 Thread Caolán McNamara 
 sw/source/core/txtnode/txtedt.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit d1252e284460998d36409d4462e953cc0e813809
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 12:14:52 2013 +0100

bounds can be -1 for not-found

Change-Id: I941ef1dae00167460f2f0de39e472ed047539f27
(cherry picked from commit 18eba6a69f49c9e8e2902f84e96cb6906ee337f1)
Reviewed-on: https://gerrit.libreoffice.org/4359
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index e1c2824..d498eb7 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -593,6 +593,15 @@ void SwTxtNode::RstAttr(const SwIndex rIdx, xub_StrLen 
nLen, sal_uInt16 nWhich,
 }
 }
 
+sal_Int32 clipIndexBounds(const OUString rStr, sal_Int32 nPos)
+{
+if (nPos  0)
+return 0;
+if (nPos  rStr.getLength())
+return rStr.getLength();
+return nPos;
+}
+
 /*
  *SwTxtNode::GetCurWord()
  *
@@ -638,6 +647,10 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
 if (aBndry.endPos != aBndry.startPos  IsSymbol( 
(xub_StrLen)aBndry.startPos ))
 aBndry.endPos = aBndry.startPos;
 
+// can have -1 as start/end of bounds not found
+aBndry.startPos = clipIndexBounds(m_Text, aBndry.startPos);
+aBndry.endPos = clipIndexBounds(m_Text, aBndry.endPos);
+
 return m_Text.copy(aBndry.startPos,
aBndry.endPos - aBndry.startPos);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/examples

2013-06-19 Thread Stephan Bergmann 
 odk/examples/java/ToDo/ToDo.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38d2ea2b25f323337b91ab1507bc0b955876a216
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 19 17:41:00 2013 +0200

Missing import

Regression introduced with 64e85a4cc8259a7d80c781e6698a8f30e7e0151d Java
cleanup, remove unused imports.

Change-Id: I843cf651e20d2dd410f481222aca5206e0166a30

diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index 7185493..e4ab0ca 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -62,7 +62,7 @@ import com.sun.star.text.XTextField;
 import com.sun.star.text.XTextRange;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-// addintional interfaces used by the implementation
+import org.openoffice.XToDo;
 
 /** This class capsulates the class, that implements the minimal component, a
  * factory for creating the service (CODE__getServiceFactory/CODE) and a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

2013-06-19 Thread Caolán McNamara 
 sw/source/core/undo/unins.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit db83cb5a7e1703b512676df6e4dfb103d936d56d
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 11:10:08 2013 +0100

unusual negative start point on split node undo

Change-Id: I787371e95d9787616ca713c808098b80e40acab0
(cherry picked from commit 967b623031cd115722e2708f1281282ca8dccbe0)
Reviewed-on: https://gerrit.libreoffice.org/4360
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 4ac9ecb..eafb7f4 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -74,9 +74,18 @@ String * SwUndoInsert::GetTxtFromDoc() const
 
 if( pCNd-IsTxtNode() )
 {
-pResult = new String(
-static_castSwTxtNode*(pCNd)-GetTxt().copy(nCntnt-nLen, nLen));
+OUString sTxt = static_castSwTxtNode*(pCNd)-GetTxt();
 
+sal_Int32 nStart = nCntnt-nLen;
+sal_Int32 nLength = nLen;
+
+if (nStart  0)
+{
+nLength += nStart;
+nStart = 0;
+}
+
+pResult = new String(sTxt.copy(nStart, nLength));
 }
 
 return pResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in solenv/bin

2013-06-19 Thread Caolán McNamara 
 Makefile.in |   12 +++-
 solenv/bin/callcatcher.Makefile |6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8fd1bd1879bae6d183ff45eba49d46ccfcd466c0
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 16:46:21 2013 +0100

bodge callcatcher build back to half-life

Change-Id: I91393aa912bd69f3fbeb67d895ff7d8021effccb

diff --git a/Makefile.in b/Makefile.in
index 7dde471..01d8d5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,11 +380,13 @@ docs:
 findunusedcode:
@which callcatcher  /dev/null 21 || \
(echo callcatcher not installed  false)
-   @sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,export 
OOO_JUNIT_JAR=.*,export OOO_JUNIT_JAR=,g  
$(SRCDIR)/config_host_callcatcher.mk
-   @echo unexport ARCH_FLAGS  $(SRCDIR)/config_host_callcatcher.mk
-   @echo unexport CFLAGS  $(SRCDIR)/config_host_callcatcher.mk
-   @echo unexport CXXFLAGS  $(SRCDIR)/config_host_callcatcher.mk
-   @mkdir -p $(SRCDIR)/solenv/callcatcher/bin  \
+   @mkdir -p $(SRCDIR)/callcatcher/config_host
+   @cp config_host/* callcatcher/config_host
+   @cp config_host.mk* callcatcher
+   @sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,export 
OOO_JUNIT_JAR=.*,export OOO_JUNIT_JAR=,g  
$(SRCDIR)/callcatcher/config_host.mk
+   @echo unexport ARCH_FLAGS  $(SRCDIR)/callcatcher/config_host.mk
+   @echo unexport CFLAGS  $(SRCDIR)/callcatcher/config_host.mk
+   @echo unexport CXXFLAGS  $(SRCDIR)/callcatcher/config_host.mk
$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
@grep ::.*\( unusedcode.all \
   | grep -v ^Atom \
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 9ea7ea5..7c24f9a 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -9,7 +9,7 @@
 
 .PHONY: all
 
-include config_host_callcatcher.mk
+include callcatcher/config_host.mk
 
 export CC:=callcatcher $(CC)
 export CXX:=callcatcher $(CXX)
@@ -23,9 +23,9 @@ export dbglevel:=2
 include $(SOLARENV)/gbuild/gbuild.mk
 
 findunusedcode:
-   $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
+   $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
Makefile.gbuild
ooinstall -l $(DEVINSTALLDIR)/opt
-   $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild 
subsequentcheck
+   $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
Makefile.gbuild subsequentcheck
callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
  $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
   unusedcode.all
___
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/source

2013-06-19 Thread Kohei Yoshida 
 sc/source/core/data/dociter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1d92cb02d801bbac413f9027d8d5a4ffe98c07b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jun 19 11:54:12 2013 -0400

Don't forget to return true if we are successful.

Else we'd never get out of this inifite loop

Change-Id: I96e072eb79cce77302b27cad42da31f9a66c3401

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index ab0035f..7479097 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -936,6 +936,7 @@ bool ScCellIterator::getCurrent()
 }
 
 maCurCell.assign(maCurColPos.first, maCurColPos.second);
+return true;
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SVG: scaling if no width/height is given

2013-06-19 Thread Thorsten Behrens 
Hi Armin,

I wonder, you wrote:
 you have found the developer of the SVG import, congrats ;-)

Christina has been doing great development work around the LibreOffice
svg story, not limited to, but including 'your' svg code - as did a
number of other people. In total, there are 26 very useful fixes on
top of the apache svgio code, and numerous (64 in this year alone)
e.g. in drawinglayer. So it appears to be more of a collective effort
on this side. ;)

 To do so, I would need a bug report on the Apache AOO bugtracker,

Why not look into the libreoffice bugtracker? It is there for all to
see. :)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: SVG: scaling if no width/height is given

2013-06-19 Thread Armin Le Grand 

Hi Christina,

On 18.06.2013 21:09, Christina Roßmanith wrote:

Hi,


you have found the developer of the SVG import, congrats ;-). Sure I am 
willing to help and always interested in bug reports for my importer; I 
have fixed some in the last days anyways.
To do so, I would need a bug report on the Apache AOO bugtracker, 
containing the needed description, evtl. test files and 
suggestions/patches. Please provide this here 
(http://issues.apache.org/ooo/).
I am developing for the public good at apache, so this will then be 
available for everyone, including LO (see my blog here: 
https://blogs.apache.org/OOo/entry/good_news_libreoffice_is_integrating). The 
other way round you will prevent 50mio others to profit from your work.


Sincerely,
Armin



the problem described here - 
https://bugs.freedesktop.org/show_bug.cgi?id=64125 is caused by a 
missing width and height attribute of the SVG given as an example. So, 
what would we expect given a ViewBox attribute when importing a graphic?


What I'd expect is that the aspect ratio is kept and a reasonable 
scaling is applied in order to fill a page, table cell or whatever. 
And that the little green squares (handles?) behave like a bounding 
box for the graphic content. Is that correct?


What I've achieved so far is the correct scaling. What I'm looking for 
is where the total size of the graphic is still determined wrong (see 
attached screenshot) - little green squares are more like DIN A4 than 
the ViewBox size.


Christina

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/prj desktop/source scp2/source sw/source

2013-06-19 Thread Andre Fischer 
 desktop/prj/d.lst   |3 
 desktop/source/app/app.cxx  |2 
 desktop/source/deployment/gui/deploymentgui.map |   28 ++
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx  |   71 --
 desktop/source/deployment/gui/dp_gui_handleversionexception.cxx |  111 
++
 desktop/source/deployment/gui/dp_gui_service.cxx|4 
 desktop/source/deployment/gui/makefile.mk   |   16 -
 desktop/source/deployment/inc/dp_gui.mk |6 
 desktop/source/inc/dp_gui_api.hxx   |   36 +++
 desktop/source/inc/dp_gui_handleversionexception.hxx|   17 -
 desktop/source/migration/services/oo3extensionmigration.cxx |4 
 scp2/source/ooo/file_library_ooo.scp|8 
 sw/source/filter/ww8/rtfexport.cxx  |   15 +
 13 files changed, 230 insertions(+), 91 deletions(-)

New commits:
commit e14095bc3b573f2c48c996fa2cb58226280d5e87
Author: Andre Fischer a...@apache.org
Date:   Wed Jun 19 15:26:41 2013 +

122398: Fixed Mac and Linux build breaker.

diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 1535275..074f2c3 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -74,6 +74,9 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
 ..\%__SRC%\bin\depl*.dll %_DEST%\bin%_EXT%\depl*.dll
 ..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib%_EXT%\deployment*.uno.so
 ..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib%_EXT%\deployment*.uno.dylib
+..\%__SRC%\bin\deploymentgui*.dll %_DEST%\bin%_EXT%\deploymentgui*.dll
+..\%__SRC%\lib\libdeploymentgui*.uno.so 
%_DEST%\lib%_EXT%\libdeploymentgui*.uno.so
+..\%__SRC%\lib\libdeploymentgui*.uno.dylib 
%_DEST%\lib%_EXT%\libdeploymentgui*.uno.dylib
 ..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin%_EXT%\deploymentmisc*.dll
 ..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib%_EXT%\libdeploymentmisc*.so
 ..\%__SRC%\lib\libdeploymentmisc*.dylib 
%_DEST%\lib%_EXT%\libdeploymentmisc*.dylib
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 30f1992..9eb1985 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -802,7 +802,7 @@ void MinimalCommandEnv::handle(
 if ( xRequest-getRequest() = verExc )
 {
 // user interaction, if an extension is already been installed.
-bApprove = dp_gui::handleVersionException( verExc );
+bApprove = handleVersionException( verExc );
 }
 
 const css::uno::Sequence css::uno::Reference 
css::task::XInteractionContinuation   conts( xRequest-getContinuations());
diff --git a/desktop/source/deployment/gui/deploymentgui.map 
b/desktop/source/deployment/gui/deploymentgui.map
new file mode 100644
index 000..ecf7bd2
--- /dev/null
+++ b/desktop/source/deployment/gui/deploymentgui.map
@@ -0,0 +1,28 @@
+###
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+###
+UDK_3_0_0 {
+global:
+component_getImplementationEnvironment;
+component_getFactory;
+handleVersionException;
+local:
+*;
+};
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx 
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index ca0dbc4..a0e2008 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -26,6 +26,7 @@
 
 
 
+#include dp_gui_handleversionexception.hxx
 
 #include sal/config.h
 
@@ -105,20 +106,6 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-namespace {
-
-OUString getVersion( OUString const  sVersion )
-{
-return ( sVersion.getLength() == 0 ) ? OUString( 
RTL_CONSTASCII_USTRINGPARAM( 0 ) ) : sVersion;
-}
-
-OUString getVersion( const uno::Reference deployment::XPackage  rPackage )
-{
-return getVersion( rPackage-getVersion());
-}
-}
-
-
 namespace dp_gui {
 
 
//==
@@ -360,62 +347,6 @@ uno::Reference ucb::XProgressHandler

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

2013-06-19 Thread Luboš Luňák 
 solenv/gbuild/PrecompiledHeaders.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cbdce1aef333d76468617b738293d07ddf70fad4
Author: Luboš Luňák l.lu...@suse.cz
Date:   Tue Jun 18 18:05:52 2013 +0200

remove PCH file before generating it

Compilers do not necessarily output all includes files when included
using a PCH, so when a PCH is being rebuilt, it might actually get
reused this way, causing its dependencies to be incomplete afterwards.
The PCH actually should not be used when being regenerated, but with MSVC
this apparently happens, even though there's only the option to create
PCH, not to use it.

Change-Id: Iee1340a60085550ab867304c44752daa04cbba31
Reviewed-on: https://gerrit.libreoffice.org/4366
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 1bc4b8a..1dddeb8 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -42,9 +42,11 @@ $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
echo $(call gb_NoexPrecompiledHeader_get_target,$*) : 
$(gb_Helper_PHONY)  $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
+   rm -f $@
$(call 
gb_PrecompiledHeader__command,$@,$*,$,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
 
 $(call gb_NoexPrecompiledHeader_get_target,%) :
+   rm -f $@
$(call 
gb_NoexPrecompiledHeader__command,$@,$*,$,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call 
gb_NoExPrecompiledHeader_get_clean_target,%)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SVG: scaling if no width/height is given

2013-06-19 Thread Armin Le Grand 

Hi Thorsten,

On 19.06.2013 17:55, Thorsten Behrens wrote:

Hi Armin,

I wonder, you wrote:

you have found the developer of the SVG import, congrats ;-)


Christina has been doing great development work around the LibreOffice
svg story, not limited to, but including 'your' svg code - as did a
number of other people. In total, there are 26 very useful fixes on
top of the apache svgio code, and numerous (64 in this year alone)
e.g. in drawinglayer. So it appears to be more of a collective effort
on this side. ;)


That's good to hear, congrats! Together with the ones taken from me this 
is quite some progress :)
Doesn't OpenSource mean to promote back those fixes/changes based on 
code any opensource project takes upstream to the source..?
We all know that the code will just diverge and makes things more 
difficult for everyone involved, don't we...?





To do so, I would need a bug report on the Apache AOO bugtracker,


Why not look into the libreoffice bugtracker? It is there for all to
see. :)


The last ime I did and asked if I could use the obvious single-line 
change (long time ago) I was rejected and blamed for even looking there, 
you know ;-)




Cheers,

-- Thorsten


Sincerely,
Armin
--
ALG
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-06-19 Thread Philipp Weissenbacher 
 svl/source/numbers/zforfind.cxx |  522 
 1 file changed, 217 insertions(+), 305 deletions(-)

New commits:
commit 904aff1932d3c88c9530f3f174ee4b8182afba1d
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Wed Jun 19 13:41:34 2013 +0200

Translate German comments, fix some WS

Change-Id: Ic52fc416aea9d1ca7235613aed7cf494f17ae21a
Reviewed-on: https://gerrit.libreoffice.org/4361
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 9fdc167..5fbb9c6 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -33,7 +33,7 @@
 #include com/sun/star/i18n/LocaleCalendar.hpp
 #include unotools/digitgroupingiterator.hxx
 
-#include svl/zforlist.hxx // NUMBERFORMAT_XXX
+#include svl/zforlist.hxx // NUMBERFORMAT_XXX
 #include zforscan.hxx
 #include svl/zformat.hxx
 
@@ -65,9 +65,6 @@ const sal_uInt8 ImpSvNumberInputScan::nMatchedUsedAsReturn = 
0x10;
  * would work, together with the nTimezonePos handling in GetTimeRef(). */
 #define NF_RECOGNIZE_ISO8601_TIMEZONES 0
 
-//---
-//  Konstruktor
-
 ImpSvNumberInputScan::ImpSvNumberInputScan( SvNumberFormatter* pFormatterP )
 :
 pUpperMonthText( NULL ),
@@ -92,9 +89,6 @@ ImpSvNumberInputScan::ImpSvNumberInputScan( 
SvNumberFormatter* pFormatterP )
 }
 
 
-//---
-//  Destruktor
-
 ImpSvNumberInputScan::~ImpSvNumberInputScan()
 {
 Reset();
@@ -110,9 +104,6 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
 }
 
 
-//---
-//  Reset
-
 void ImpSvNumberInputScan::Reset()
 {
 nMonth   = 0;
@@ -148,8 +139,6 @@ void ImpSvNumberInputScan::Reset()
 }
 
 
-//---
-//
 // static
 inline bool ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
 {
@@ -157,8 +146,6 @@ inline bool ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
 }
 
 
-//---
-//
 void ImpSvNumberInputScan::TransformInput( OUString rStr )
 {
 sal_Int32 nPos, nLen;
@@ -178,12 +165,10 @@ void ImpSvNumberInputScan::TransformInput( OUString rStr 
)
 }
 
 
-//---
-//  StringToDouble
-//
-// Only simple unsigned floating point values without any error detection,
-// decimal separator has to be '.'
-
+/**
+ * Only simple unsigned floating point values without any error detection,
+ * decimal separator has to be '.'
+ */
 double ImpSvNumberInputScan::StringToDouble( const OUString rStr, bool 
bForceFraction )
 {
 double fNum = 0.0;
@@ -218,27 +203,25 @@ double ImpSvNumberInputScan::StringToDouble( const 
OUString rStr, bool bForceFr
 }
 
 
-//---
-//   NextNumberStringSymbol
-//
-// Zerlegt die Eingabe in Zahlen und Strings fuer die weitere
-// Verarbeitung (Turing-Maschine).
-//---
-// Ausgangs Zustand = GetChar
-//---+---+---+---
-// Alter Zustand | gelesenes Zeichen | Aktion| Neuer Zustand
-//---+---+---+---
-// GetChar   | Ziffer| Symbol=Zeichen| GetValue
-//   | Sonst | Symbol=Zeichen| GetString
-//---|---+---+---
-// GetValue  | Ziffer| Symbol=Symbol+Zeichen | GetValue
-//   | Sonst | Dec(CharPos)  | Stop
-//---+---+---+---
-// GetString | Ziffer| Dec(CharPos)  | Stop
-//   | Sonst | Symbol=Symbol+Zeichen | GetString
-//---+---+---+---
-
-enum ScanState  // States der Turing-Maschine
+/**
+ * Splits up the input into numbers and strings for further processing
+ * (by the Turing machine).
+ *
+ * Starting state = GetChar
+ * 
---+---+-+---
+ *  Old State | Character read| Event   | New state
+ * 
---+---+-+---
+ *  GetChar   | Number| Symbol = Character  | GetValue
+ *| Else  | Symbol = Character  | GetString
+ * 
---|---+-+---

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

2013-06-19 Thread Philipp Weissenbacher 
 sw/source/filter/ww8/ww8par.cxx |  151 +++-
 1 file changed, 74 insertions(+), 77 deletions(-)

New commits:
commit f86ec4cdbd9a7b8851748a4647969069fb75660b
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Wed Jun 19 15:38:52 2013 +0200

Start translating German comments, fix some WS

Change-Id: Ia53a9283fcb8f75386ec23ab3a3df5195a9995df
Reviewed-on: https://gerrit.libreoffice.org/4365
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 907454f..7e98b00 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -73,7 +73,7 @@
 #include viewsh.hxx
 #include shellres.hxx
 #include mdiexp.hxx   // Progress
-#include statstr.hrc  // ResId fuer Statusleiste
+#include statstr.hrc  // ResId for Statusbar
 #include swerror.h// ERR_WW8_...
 #include swtable.hxx  // class SwTableLines, ...
 #include fchrfmt.hxx
@@ -459,7 +459,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 }
 }
 
-//  Textrahmen, auch Title oder Outline
+// Text Frame also Title or Outline
 sal_uInt32 nTextId = GetPropertyValue( DFF_Prop_lTxid, 0 );
 if( nTextId )
 {
@@ -574,14 +574,14 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 pObj = new SdrRectObj(OBJ_TEXT, rTextRect);
 }
 
-// Die vertikalen Absatzeinrueckungen sind im BoundRect mit drin,
-// hier rausrechnen
+// The vertical paragraph justification are contained within the
+// BoundRect so calculate it here
 Rectangle aNewRect(rTextRect);
 aNewRect.Bottom() -= nTextTop + nTextBottom;
 aNewRect.Right() -= nTextLeft + nTextRight;
 
-// Nur falls es eine einfache Textbox ist, darf der Writer
-// das Objekt durch einen Rahmen ersetzen, ansonsten
+// Only if its a simple Textbox, Writer can replace the Object
+// with a Frame, else
 if( bIsSimpleDrawingTextBox )
 {
 ::boost::shared_ptrSvxMSDffShapeInfo const pTmpRec(
@@ -628,7 +628,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 ;
 }
 
-// Abstaende an den Raendern der Textbox setzen
+// Set distances on Textbox's margins
 aSet.Put( SdrTextLeftDistItem( nTextLeft ) );
 aSet.Put( SdrTextRightDistItem( nTextRight ) );
 aSet.Put( SdrTextUpperDistItem( nTextTop ) );
@@ -853,12 +853,12 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 
 if( pImpRec-nShapeId )
 {
-// Import-Record-Liste ergaenzen
+// Complement Import Record List
 pImpRec-pObj = pObj;
 rImportData.aRecords.insert( pImpRec );
 
-// Eintrag in Z-Order-Liste um Zeiger auf dieses Objekt ergaenzen
-/*Only store objects which are not deep inside the tree*/
+// Complement entry in Z Order List with a pointer to this Object
+// Only store objects which are not deep inside the tree
 if( ( rObjData.nCalledByGroup == 0 )
 ||
 ( (rObjData.nSpFlags  SP_FGROUP)
@@ -875,10 +875,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
 return pObj;
 }
 
-/***
-#  Spezial FastSave - Attribute
-#**/
-
+/**
+ * Special FastSave - Attributes
+ */
 void SwWW8ImplReader::Read_StyleCode( sal_uInt16, const sal_uInt8* pData, 
short nLen )
 {
 if (nLen  0)
@@ -898,14 +897,16 @@ void SwWW8ImplReader::Read_StyleCode( sal_uInt16, const 
sal_uInt8* pData, short
 }
 }
 
-// Read_Majority ist fuer Majority ( 103 ) und Majority50 ( 108 )
+/**
+ * Read_Majority is for Majority (103) and Majority50 (108)
+ */
 void SwWW8ImplReader::Read_Majority( sal_uInt16, const sal_uInt8* , short )
 {
 }
 
-//-
-//Stack
-//-
+/**
+ * Stack
+ */
 void SwWW8FltControlStack::NewAttr(const SwPosition rPos,
 const SfxPoolItem rAttr)
 {
@@ -1390,7 +1391,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const 
sal_uInt8* pData, short nLen)
 pSty = 0;
 }
 else
-pSty = 0;   // gib die Suche auf
+pSty = 0; // Give up on the search
 }
 }
 
@@ -1406,7 +1407,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const 
sal_uInt8* pData, short nLen)
 {
 short nPos = SVBT16ToShort(pIns + i*2);
 aTabStop.GetTabPos() = nPos;
-switch( SVBT8ToByte( pTyp[i].aBits1 )  0x7 )   //

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - odk/examples

2013-06-19 Thread Stephan Bergmann 
 odk/examples/java/ToDo/ToDo.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4e8ca6bd6f6d4f7645bc68feee153210e4a4043
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 19 17:41:00 2013 +0200

Missing import

Regression introduced with 64e85a4cc8259a7d80c781e6698a8f30e7e0151d Java
cleanup, remove unused imports.

Change-Id: I843cf651e20d2dd410f481222aca5206e0166a30
(cherry picked from commit 38d2ea2b25f323337b91ab1507bc0b955876a216)
Reviewed-on: https://gerrit.libreoffice.org/4367
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index 7185493..e4ab0ca 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -62,7 +62,7 @@ import com.sun.star.text.XTextField;
 import com.sun.star.text.XTextRange;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-// addintional interfaces used by the implementation
+import org.openoffice.XToDo;
 
 /** This class capsulates the class, that implements the minimal component, a
  * factory for creating the service (CODE__getServiceFactory/CODE) and a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread David Tardon 
 svx/source/table/tablecontroller.cxx |   42 +++
 1 file changed, 42 insertions(+)

New commits:
commit 58c910eda00d1f3751ac1054ef2fcafe4a90abde
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 13 14:47:50 2013 +0200

fdo#62224 set spacing to content too

(cherry picked from commit 14c139e3705c537556f493657f9cb01818d1f80d)

Change-Id: Idafcd96ff8b01139dfc22cf3d0d2f5e98759488e
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4358
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index b25e5f1..1cdf9e0 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2588,11 +2588,14 @@ struct LinesState
 LinesState(SvxBoxItem rBoxItem_, SvxBoxInfoItem rBoxInfoItem_)
 : rBoxItem(rBoxItem_)
 , rBoxInfoItem(rBoxInfoItem_)
+, bDistanceIndeterminate(false)
 {
 std::fill_n(aBorderSet, 4, false);
 std::fill_n(aInnerLineSet, 2, false);
 std::fill_n(aBorderIndeterminate, 4, false);
 std::fill_n(aInnerLineIndeterminate, 2, false);
+std::fill_n(aDistanceSet, 4, false);
+std::fill_n(aDistance, 4, 0);
 }
 
 SvxBoxItem rBoxItem;
@@ -2601,6 +2604,9 @@ struct LinesState
 bool aInnerLineSet[2];
 bool aBorderIndeterminate[4];
 bool aInnerLineIndeterminate[2];
+bool aDistanceSet[4];
+sal_uInt16 aDistance[4];
+bool bDistanceIndeterminate;
 };
 
 class BoxItemWrapper
@@ -2686,6 +2692,21 @@ void lcl_MergeBorderOrInnerLine(
 }
 }
 
+void lcl_MergeDistance(
+LinesState rLinesState, const sal_uInt16 nIndex, const sal_uInt16 
nDistance)
+{
+if (rLinesState.aDistanceSet[nIndex])
+{
+if (!rLinesState.bDistanceIndeterminate)
+rLinesState.bDistanceIndeterminate = nDistance != 
rLinesState.aDistance[nIndex];
+}
+else
+{
+rLinesState.aDistance[nIndex] = nDistance;
+rLinesState.aDistanceSet[nIndex] = true;
+}
+}
+
 void lcl_MergeCommonBorderAttr(LinesState rLinesState, const SvxBoxItem 
rCellBoxItem, const sal_Int32 nCellFlags)
 {
 if( (nCellFlags  (CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 )
@@ -2706,6 +2727,9 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState, 
const SvxBoxItem rCellB
 else if( nCellFlags  CELL_AFTER )
 lcl_MergeBorderLine(rLinesState, rCellBoxItem.GetLeft(), 
BOX_LINE_RIGHT, VALID_RIGHT);
 }
+
+// NOTE: inner distances for cells outside the selected range
+// are not relevant - we ignore them.
 }
 else
 {
@@ -2715,6 +2739,11 @@ void lcl_MergeCommonBorderAttr(LinesState rLinesState, 
const SvxBoxItem rCellB
 lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetBottom(), 
BOX_LINE_BOTTOM, VALID_BOTTOM, nCellFlags  CELL_BOTTOM);
 lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetLeft(), 
BOX_LINE_LEFT, VALID_LEFT, nCellFlags  CELL_LEFT);
 lcl_MergeBorderOrInnerLine(rLinesState, rCellBoxItem.GetRight(), 
BOX_LINE_RIGHT, VALID_RIGHT, nCellFlags  CELL_RIGHT);
+
+lcl_MergeDistance(rLinesState, BOX_LINE_TOP, 
rCellBoxItem.GetDistance(BOX_LINE_TOP));
+lcl_MergeDistance(rLinesState, BOX_LINE_BOTTOM, 
rCellBoxItem.GetDistance(BOX_LINE_BOTTOM));
+lcl_MergeDistance(rLinesState, BOX_LINE_LEFT, 
rCellBoxItem.GetDistance(BOX_LINE_LEFT));
+lcl_MergeDistance(rLinesState, BOX_LINE_RIGHT, 
rCellBoxItem.GetDistance(BOX_LINE_RIGHT));
 }
 }
 
@@ -2787,6 +2816,19 @@ void 
SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem rBox
 aLinesState.rBoxInfoItem.SetValid(VALID_HORI);
 if (!aLinesState.aInnerLineIndeterminate[BOXINFO_LINE_VERT])
 aLinesState.rBoxInfoItem.SetValid(VALID_VERT);
+
+if (!aLinesState.bDistanceIndeterminate)
+{
+if (aLinesState.aDistanceSet[BOX_LINE_TOP])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_TOP], 
BOX_LINE_TOP);
+if (aLinesState.aDistanceSet[BOX_LINE_BOTTOM])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_BOTTOM], 
BOX_LINE_BOTTOM);
+if (aLinesState.aDistanceSet[BOX_LINE_LEFT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_LEFT], 
BOX_LINE_LEFT);
+if (aLinesState.aDistanceSet[BOX_LINE_RIGHT])
+
aLinesState.rBoxItem.SetDistance(aLinesState.aDistance[BOX_LINE_RIGHT], 
BOX_LINE_RIGHT);
+aLinesState.rBoxInfoItem.SetValid(VALID_DISTANCE);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

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

2013-06-19 Thread David Tardon 
 editeng/inc/editeng/borderline.hxx   |2 
 editeng/source/items/borderline.cxx  |5 
 svx/source/table/tablecontroller.cxx |  219 ++-
 svx/source/table/tablecontroller.hxx |8 +
 4 files changed, 232 insertions(+), 2 deletions(-)

New commits:
commit 2839735633dedfcbf2de77180a140eb4bf9a9c2d
Author: David Tardon dtar...@redhat.com
Date:   Sat Jun 1 09:43:50 2013 +0200

fdo#62224 reconstruct border state for table dialog

Change-Id: I68a4cd1974579119a2d6dccba008441a9bec78df
(cherry picked from commit 67e87f8b88a5a6a741717cc4a8e64f65f9c9cd52)

Conflicts:
include/svx/sdr/table/tablecontroller.hxx

Change-Id: Id9d72360d234dd1f9dbb9fd252fc0abefff9ad63
Reviewed-on: https://gerrit.libreoffice.org/4144
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/editeng/inc/editeng/borderline.hxx 
b/editeng/inc/editeng/borderline.hxx
index 067e216..a7713b7 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -160,7 +160,7 @@ namespace editeng {
 static BorderWidthImpl getWidthImpl( SvxBorderStyle nStyle );
 };
 
-// 
+EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine rLeft, const 
SvxBorderLine rRight );
 
 } // namespace editeng
 
diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 646a348..fe451c3 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -723,6 +723,11 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine 
rOtherLine ) const
 return false;
 }
 
+bool operator!=( const SvxBorderLine rLeft, const SvxBorderLine rRight )
+{
+return !(rLeft == rRight);
+}
+
 } // namespace editeng
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 16a2c2c..b25e5f1 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include algorithm
 
 #include tablecontroller.hxx
 
@@ -712,7 +713,6 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 if( !pArgs  pTableObj-GetModel() )
 {
 SfxItemSet aNewAttr( pTableObj-GetModel()-GetItemPool() );
-MergeAttrFromSelectedCells(aNewAttr, sal_False);
 
 // merge drawing layer text distance items into SvxBoxItem used by the 
dialog
 SvxBoxItem aBoxItem( static_cast const SvxBoxItem ( aNewAttr.Get( 
SDRATTR_TABLE_BORDER ) ) );
@@ -720,7 +720,13 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextRightDistItem)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), 
BOX_LINE_RIGHT );
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextUpperDistItem)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), 
BOX_LINE_TOP );
 aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 ( 
((SdrTextLowerDistItem)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), 
BOX_LINE_BOTTOM );
+
+SvxBoxInfoItem aBoxInfoItem( static_cast const SvxBoxInfoItem ( 
aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
+
+MergeAttrFromSelectedCells(aNewAttr, sal_False);
+FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
 aNewAttr.Put( aBoxItem );
+aNewAttr.Put( aBoxInfoItem );
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 std::auto_ptr SfxAbstractTabDialog  pDlg( pFact ? 
pFact-CreateSvxFormatCellsDialog( NULL, aNewAttr, pTableObj-GetModel(), 
pTableObj) : 0 );
@@ -2574,6 +2580,217 @@ IMPL_LINK_NOARG(SvxTableController, UpdateHdl)
 return 0;
 }
 
+namespace
+{
+
+struct LinesState
+{
+LinesState(SvxBoxItem rBoxItem_, SvxBoxInfoItem rBoxInfoItem_)
+: rBoxItem(rBoxItem_)
+, rBoxInfoItem(rBoxInfoItem_)
+{
+std::fill_n(aBorderSet, 4, false);
+std::fill_n(aInnerLineSet, 2, false);
+std::fill_n(aBorderIndeterminate, 4, false);
+std::fill_n(aInnerLineIndeterminate, 2, false);
+}
+
+SvxBoxItem rBoxItem;
+SvxBoxInfoItem rBoxInfoItem;
+bool aBorderSet[4];
+bool aInnerLineSet[2];
+bool aBorderIndeterminate[4];
+bool aInnerLineIndeterminate[2];
+};
+
+class BoxItemWrapper
+{
+public:
+BoxItemWrapper(SvxBoxItem rBoxItem, SvxBoxInfoItem rBoxInfoItem, 
sal_uInt16 nBorderLine, sal_uInt16 nInnerLine, bool bBorder);
+
+const SvxBorderLine* getLine() const;
+void setLine(const SvxBorderLine* pLine);
+
+private:
+SvxBoxItem m_rBoxItem;
+SvxBoxInfoItem m_rBoxInfoItem;
+const sal_uInt16 m_nLine;
+const bool m_bBorder;
+};
+
+BoxItemWrapper::BoxItemWrapper(
+SvxBoxItem rBoxItem, SvxBoxInfoItem

Re: SVG: scaling if no width/height is given

2013-06-19 Thread Bjoern Michaelsen 
Hi Armin,

On Wed, Jun 19, 2013 at 06:20:55PM +0200, Armin Le Grand wrote:
 The last ime I did and asked if I could use the obvious single-line
 change (long time ago) I was rejected and blamed for even looking
 there, you know ;-)

You can -- obviously respecting the usual license. Its not like the consenus on
the licensing choice in the LibreOffice project -- that served us so excellent
-- is a secret somehow. But that is really off topic on this list, which is
here for discussion of patches and technical progress.

Best,

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

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source

2013-06-19 Thread Efe Gürkan YALAMAN 
 cui/source/options/optaboutconfig.hxx |   24 
 1 file changed, 24 insertions(+)

New commits:
commit dc142bde4f9f2fbc0e37cf7911cc514e294904cc
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date:   Wed Jun 19 21:07:55 2013 +0300

about config page header prototype

prototype is added for about:config utility as SfxTabPage.

Change-Id: I5146c0615a42f0ae084b3ec29b6b5f3b6677d9c6

diff --git a/cui/source/options/optaboutconfig.hxx 
b/cui/source/options/optaboutconfig.hxx
new file mode 100644
index 000..969f130a
--- /dev/null
+++ b/cui/source/options/optaboutconfig.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef _SVX_OPTABOUTCONFIG_HXX
+#define _SVX_OPTABOUTCONFIG_HXX
+
+#include svx/simpltabl.hxx
+
+namespace svx
+{
+class OptHeaderTabListBox;
+}
+
+
+class SvxAboutConfigTabPage : public SfxTabPage
+{
+private:
+SvxSimpleTableContainer* m_pPrefCtrl;
+//In case of tab page we can think a revert button
+//PushButton* m_pDefaultBtn
+PushButton* m_pEditBtn;
+
+::svx::OptHeaderTabListBox* pPrefBox;
+public:
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unused and bugous border dialog

2013-06-19 Thread Zolnai Tamás 
Some additional informations.
As I can imagine, this dialog can be opened from a menu for example (maybe
from Format - Border). The program decides which type of the dialog must
be opened based on what kind of object is selected in the component. If
this object is a table cell, than use type for table, if this is a frame
than use the frame specific one, otherwise use the type belonging to
paragraphs. However by now there is border for page and in future there
will be one for characters. So when a text is selected, than the decision
is not obvious.

Regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

2013-06-19 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Jan Holesovsky ke...@suse.cz changed:

   What|Removed |Added

 Depends on||65924

--- Comment #3 from Jan Holesovsky ke...@suse.cz ---
Nominating 65924, makes the Writer really ugly.  Cannot fix myself in the
following few days, so better to track it properly :-)

-- 
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' - e1/4095bc3b573f2c48c996fa2cb58226280d5e87

2013-06-19 Thread Caolán McNamara 
 e1/4095bc3b573f2c48c996fa2cb58226280d5e87 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 652d672bf491232897930de37bb3344a20277894
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 20:09:58 2013 +0100

Notes added by 'git notes add'

diff --git a/e1/4095bc3b573f2c48c996fa2cb58226280d5e87 
b/e1/4095bc3b573f2c48c996fa2cb58226280d5e87
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/e1/4095bc3b573f2c48c996fa2cb58226280d5e87
@@ -0,0 +1 @@
+ignore: aoo
___
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' - 2 commits - sc/inc sc/source

2013-06-19 Thread Kohei Yoshida 
 sc/inc/cellvalue.hxx  |5 ++
 sc/source/core/data/cellvalue.cxx |   77 --
 sc/source/core/data/table4.cxx|   23 ++-
 3 files changed, 68 insertions(+), 37 deletions(-)

New commits:
commit 0ad0d04928da99a3a9b8f1bdd44382388240f8d1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jun 19 15:19:31 2013 -0400

Same fix for fill series  some cleanup.

Change-Id: I2f741305ac64c221c5af8ab99f3ddff0ce56f458

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 02f9c7d..c605a97 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -766,7 +766,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 short nHeadNoneTail = 0;
 sal_Int32 nStringValue = 0;
 String aValue;
-ScRefCellValue aSrcCell;
+ScCellValue aSrcCell;
 CellType eCellType = CELLTYPE_NONE;
 bool bIsOrdinalSuffix = false;
 
@@ -846,21 +846,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 }
 }
 else
-{
-ScAddress aDestPos( static_castSCCOL(nCol), 
static_castSCROW(nRow), nTab );
-switch ( eCellType )
-{
-case CELLTYPE_STRING:
-
aCol[nCol].SetRawString(aDestPos.Row(), *aSrcCell.mpString);
-case CELLTYPE_EDIT:
-aCol[nCol].SetEditText(aDestPos.Row(), 
aSrcCell.mpEditText-Clone());
-break;
-default:
-{
-// added to avoid warnings
-}
-}
-}
+aSrcCell.commit(aCol[nCol], nRow);
+
 break;
 case CELLTYPE_FORMULA :
 FillFormula( nFormulaCounter, bFirst, 
aSrcCell.mpFormula,
commit 709f5504c4545f240ec78284c8f812d74af24a26
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jun 19 14:58:35 2013 -0400

We need to clone the source cell value to prevent crash.

If we don't clone this, the original string value would become invalid
after the first insertion, which may cause a reallocation of the array
that stores the cell.

Change-Id: I5b1bb5f378ed5503169fce75fcbc7aeb85c5ed6e

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index b1be68d..43e7a05 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -17,6 +17,7 @@ class ScDocument;
 class ScFormulaCell;
 class EditTextObject;
 class ScColumn;
+struct ScRefCellValue;
 
 /**
  * Store arbitrary cell value of any kind.  It only stores cell value and
@@ -34,6 +35,7 @@ struct SC_DLLPUBLIC ScCellValue
 };
 
 ScCellValue();
+ScCellValue( const ScRefCellValue rCell );
 ScCellValue( double fValue );
 ScCellValue( const OUString rString );
 ScCellValue( const EditTextObject rEditText );
@@ -61,6 +63,8 @@ struct SC_DLLPUBLIC ScCellValue
  */
 void commit( ScDocument rDoc, const ScAddress rPos ) const;
 
+void commit( ScColumn rColumn, SCROW nRow ) const;
+
 /**
  * Set cell value at specified position in specified document. But unlike
  * commit(), this method sets the original value to the document without
@@ -79,6 +83,7 @@ struct SC_DLLPUBLIC ScCellValue
 bool equalsWithoutFormat( const ScCellValue r ) const;
 
 ScCellValue operator= ( const ScCellValue r );
+ScCellValue operator= ( const ScRefCellValue r );
 
 void swap( ScCellValue r );
 };
diff --git a/sc/source/core/data/cellvalue.cxx 
b/sc/source/core/data/cellvalue.cxx
index f9575d5..617eb29 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -102,6 +102,31 @@ bool equalsWithoutFormatImpl( const _T left, const _T 
right )
 return false;
 }
 
+templatetypename _T
+void commitToColumn( const _T rCell, ScColumn rColumn, SCROW nRow )
+{
+switch (rCell.meType)
+{
+case CELLTYPE_STRING:
+rColumn.SetRawString(nRow, *rCell.mpString);
+break;
+case CELLTYPE_EDIT:
+rColumn.SetEditText(nRow, ScEditUtil::Clone(*rCell.mpEditText, 
rColumn.GetDoc()));
+break;
+case CELLTYPE_VALUE:
+rColumn.SetValue(nRow, rCell.mfValue);
+break;
+case CELLTYPE_FORMULA:
+{
+ScAddress aDestPos(rColumn.GetCol(), nRow, rColumn.GetTab());
+rColumn.SetFormulaCell(nRow, new ScFormulaCell(*rCell.mpFormula, 
rColumn.GetDoc(),

[Libreoffice-commits] core.git: 3 commits - Makefile.in sw/source vcl/source vcl/win

2013-06-19 Thread Oliver-Rainer Wittmann 
 Makefile.in   |2 ++
 sw/source/filter/ww8/rtfexport.cxx|   15 ++-
 vcl/source/gdi/textlayout.cxx |2 +-
 vcl/source/glyphs/graphite_layout.cxx |2 +-
 vcl/source/window/winproc.cxx |   11 ---
 vcl/win/source/window/salframe.cxx|4 
 6 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit b7f2129c1186e1c5b2dd19ebb79ff82b213c0870
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Wed Jun 19 14:18:36 2013 +

Resolves: #i120023# RTF export certain special copy-and-paste scenarios

(cherry picked from commit d70e1e8ea81a942875f91fdef75d3e39fba42eff)

Conflicts:
sw/source/filter/ww8/rtfexport.cxx

Change-Id: I845f3f2bebe411969483a53c45ef9413f7f1b903

diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index a766e348..0787f37 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -391,8 +391,21 @@ void RtfExport::WriteStyles()
 void RtfExport::WriteMainText()
 {
 SAL_INFO(sw.rtf, OSL_THIS_FUNC   start);
-pCurPam-GetPoint()-nNode = 
pDoc-GetNodes().GetEndOfContent().StartOfSectionNode()-GetIndex();
+
+SwTableNode* pTableNode = pCurPam-GetNode()-FindTableNode();
+if ( m_pWriter  m_pWriter-bWriteOnlyFirstTable
+  pTableNode != 0 )
+{
+pCurPam-GetPoint()-nNode = *pTableNode;
+pCurPam-GetMark()-nNode = *(pTableNode-EndOfSectionNode());
+}
+else
+{
+pCurPam-GetPoint()-nNode = 
pDoc-GetNodes().GetEndOfContent().StartOfSectionNode()-GetIndex();
+}
+
 WriteText();
+
 SAL_INFO(sw.rtf, OSL_THIS_FUNC   end);
 }
 
commit 4f3287c8b8e72dcad9539c95b8d14ac7bebd35d7
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 20:05:18 2013 +0100

bodge callcatcher some more

Change-Id: Ie2e126700540cbec2a94f40250b2a114d1ea9306

diff --git a/Makefile.in b/Makefile.in
index 01d8d5c..b5681c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -384,6 +384,8 @@ findunusedcode:
@cp config_host/* callcatcher/config_host
@cp config_host.mk* callcatcher
@sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,export 
OOO_JUNIT_JAR=.*,export OOO_JUNIT_JAR=,g  
$(SRCDIR)/callcatcher/config_host.mk
+   @sed -i -e s,g++,callcatcher g++,g 
$(SRCDIR)/callcatcher/config_host.mk
+   @sed -i -e s,gcc,callcatcher gcc,g 
$(SRCDIR)/callcatcher/config_host.mk
@echo unexport ARCH_FLAGS  $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CFLAGS  $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CXXFLAGS  $(SRCDIR)/callcatcher/config_host.mk
commit bbabdfd84135bf2b8db09a4c1fb1d6f390ea5dba
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 17:51:18 2013 +0100

WaE: for higher debugging levels

Change-Id: Ibcf081c0c64381e8c188764f036687a8bfc0ea0e

diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index ebac541..7be750d 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -188,7 +188,7 @@ namespace vcl
 aTrace.append(  ):  );
 aTrace.append( nTextWidth );
 aTrace.append(  = (  );
-for ( size_t i=0; i_nLength; )
+for ( sal_Int32 i=0; i_nLength; )
 {
 aTrace.append( _pDXAry[i] );
 if ( ++i  _nLength )
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 034842a..afd8411 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -603,7 +603,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 if (pSegment != NULL)
 {
 #ifdef GRLAYOUT_DEBUG
-fprintf(grLog(),Gr::LayoutText %d-%d, context %d, len %d, 
numchars % SAL_PRI_SIZET u, rtl %d scaling %f:, rArgs.mnMinCharPos,
+fprintf(grLog(),Gr::LayoutText %d-%d, context %d, len %d, 
numchars %d, rtl %d scaling %f:, rArgs.mnMinCharPos,
rArgs.mnEndCharPos, limit, rArgs.mnLength, numchars, bRtl, 
mfScaling);
 for (int i = mnSegCharOffset; i  limit; ++i)
 fprintf(grLog(),  %04X, rArgs.mpStr[i]);
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 73e5a7a..8485971 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -51,17 +51,6 @@
 #include com/sun/star/datatransfer/dnd/XDragSource.hpp
 #include com/sun/star/awt/MouseEvent.hpp
 
-#if OSL_DEBUG_LEVEL  1
-char dbgbuffer[1024];
-#ifndef WNT
-#include stdio.h
-#define MyOutputDebugString(s) (fprintf(stderr, s ))
-#else
-extern void MyOutputDebugString( char *s);
-#endif
-#endif
-
-
 // ===
 
 #define IMPL_MIN_NEEDSYSWIN 49
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index

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

2013-06-19 Thread Caolán McNamara 
 d7/0e1e8ea81a942875f91fdef75d3e39fba42eff |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 75b645d9d78b799f1ea3797bf53f18311a32b291
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 20:18:11 2013 +0100

Notes added by 'git notes add'

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

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

2013-06-19 Thread Caolán McNamara 
 sfx2/source/dialog/dinfdlg.cxx |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 7694bb997a68f6f8ebc03817be7e31ceb872ceb4
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 19 21:18:20 2013 +0100

Resolves: fdo#65930 line height needs to be calculated in ctor

we need to know that right from the start, not after the first
layout event after shown.

Change-Id: If7cc12cdf3e83913f0162fe34b376196162f6a45

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 60fb441..cc2768c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1398,6 +1398,19 @@ CustomPropertiesWindow::CustomPropertiesWindow(Window* 
pParent,
 m_aNameBox.SetAccessibleName(rHeaderAccName);
 m_aTypeBox.SetAccessibleName(rHeaderAccType);
 m_aValueEdit.SetAccessibleName(rHeaderAccValue);
+
+m_aNameBox.Hide();
+m_aTypeBox.Hide();
+m_aValueEdit.Hide();
+m_aDateField.Hide();
+m_aTimeField.Hide();
+m_aDurationField.Hide();
+m_aEditButton.Hide();
+m_aYesNoButton.Hide();
+m_aRemoveButton.Hide();
+
+m_nLineHeight =
+( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
@@ -1555,16 +1568,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 DBG_ASSERT( pHeaderBar, CustomPropertiesWindow::InitControls(): invalid 
headerbar );
 DBG_ASSERT( pScrollBar, CustomPropertiesWindow::InitControls(): invalid 
scrollbar );
 
-m_aNameBox.Hide();
-m_aTypeBox.Hide();
-m_aValueEdit.Hide();
-m_aDateField.Hide();
-m_aTimeField.Hide();
-m_aDurationField.Hide();
-m_aEditButton.Hide();
-m_aYesNoButton.Hide();
-m_aRemoveButton.Hide();
-
 const long nOffset = 4;
 const long nScrollBarWidth = pScrollBar-GetSizePixel().Width();
 const long nButtonWidth = m_aRemoveButton.GetSizePixel().Width() + 
nScrollBarWidth + nOffset;
@@ -1614,9 +1617,6 @@ void CustomPropertiesWindow::InitControls( HeaderBar* 
pHeaderBar, const ScrollBa
 
 pCurrent++;
 }
-
-m_nLineHeight =
-( m_aRemoveButton.GetPosPixel().Y() * 2 ) + 
m_aRemoveButton.GetSizePixel().Height();
 }
 
 sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   3   >