String to OUString and SDIs

[Matteo Casalin]

Hi all,
I'm currently working in String to OUString conversion. Randomly, I 
started converting include/svl/poolitem.hxx (just removing an unused 
#include ), and this started a long sequence of files 
to be fixed. In these, I found that some classes are referred by SDI 
files [1].
Before putting too much effort in this patch, I wonder if anybody has 
any advice on whether this conversion will break something (even for 
compatibility) or not.
I would perform a "make clean; make dev-install" before submission to 
gerrit, just to verify that no major issue exist, but if it's already 
known to break something I can focus on other areas.


Thanks in advance
Cheers
Matteo

[1] e.g. SfxStringListItem which is in
* /core/svx/sdi/svxitems.sdi:
 394 item String SfxStringListItem;
* /core/svx/sdi/svx.sdi:
 940 SfxStringListItem GetRedoStrings SID_GETREDOSTRINGS
4967 SfxStringListItem GetUndoStrings SID_GETUNDOSTRINGS
   15338 SfxStringListItem FontNameStringList SID_FONTNAMELIST
   15379 SlotType = SfxStringListItem
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#60924 autoinstall - gbuild/scp2: add calc module

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4225

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/4225/1

fdo#60924 autoinstall - gbuild/scp2: add calc module

Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb
---
M Repository.mk
M scp2/AutoInstallLibs.mk
M scp2/InstallModule_calc.mk
M scp2/source/calc/file_calc.scp
M scp2/source/calc/module_calc.scp
M solenv/gbuild/Helper.mk
6 files changed, 22 insertions(+), 32 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 748fb61..068cbb8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -209,6 +209,19 @@
 dbu \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,CALC, \
+analysis \
+calc \
+date \
+pricing \
+sc \
+scd \
+scfilt \
+scui \
+solver \
+vbaobj \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
 svgfilter \
 flash \
@@ -393,35 +406,26 @@
adabasui \
ado \
 agg \
-analysis \
 $(if $(filter $(OS),ANDROID),, \
basebmp \
 ) \
 communi \
-date \
 oox \
ooxml \
 sdbc \
 AppleRemote \
 avmediaQuickTime \
-calc \
filtertracer \
 log \
MacOSXSpell \
 mork \
 mozab2 \
 mozabdrv \
-pricing \
 protocolhandler \
 rpt \
 rptui \
 rptxml \
-sc \
-scd \
-scfilt \
-scui \
 simplecm \
-solver \
 spa \
 spell \
 sts \
@@ -636,7 +640,6 @@
 ucptdoc1 \
 updatefeed \
 vbaevents \
-vbaobj \
 vbaswobj \
 $(if $(filter $(OS),MACOSX), \
 fps_aqua \
diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk
index 7fc4878..5db0d39 100644
--- a/scp2/AutoInstallLibs.mk
+++ b/scp2/AutoInstallLibs.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_AutoInstallLibs_AutoInstallLibs))
 
 $(eval $(call 
gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+$(eval $(call 
gb_AutoInstallLibs_add_category,calc,CALC,LIBO_LIB_FILE,auto_Calc_Lib))
 $(eval $(call 
gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
 $(eval $(call 
gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
 $(eval $(call 
gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index dba5960..acb1009 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/calc))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
ENABLE_LPSOLVE \
SYSTEM_LPSOLVE \
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 115681b..3f17394 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -18,11 +18,7 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
-STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
-
-STD_LIB_FILE( gid_File_Lib_Pricing, pricing)
+#include "AutoInstallLibs/calc"
 
 File gid_File_Share_Registry_Calc_Xcd
 TXT_FILE_BODY;
@@ -30,18 +26,6 @@
 Dir = gid_Brand_Dir_Share_Registry;
 Name = "calc.xcd";
 End
-
-STD_LIB_FILE( gid_File_Lib_Calc, calc)
-
-STD_LIB_FILE( gid_File_Lib_Date, date)
-
-STD_LIB_FILE( gid_File_Lib_Sc, sc)
-
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
-
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
-
-STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
 STD_RES_FILE( gid_File_Res_Analysis, analysis)
 
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 46b4271..a23a0bbb 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -33,9 +33,9 @@
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
-gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-gid_File_Lib_Vbaobj,
+Files = (auto_Calc_Lib_ALL
+
gid_File_Share_Registry_Calc_Xcd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
+gid_File_Lib_Lpsolve,
 gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
@@ -45,7 +45,7 @@
 ParentID = gid_Module_Prg_Calc_Bin;
 Sortkey = "700";
 Default = YES;
-Files = 
(gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis,gid_File_Lib_Pricing);
+Files = (gid_File_Zip_Addin,gid_File_Lib_Rot);
 End
 
 Module gid_Module_Brand_Prg_Calc
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbui

Re: [GSoC] Android Impress Remote: Weekly Report #0

[Artur Dryomov]

Hi All,

I thought that this will be an interesting discussion ;-)

My GSoC proposal mentioned movement to Maven because…
* It is really easy to manage dependencies.
* It is really easy to manage lifecycle: compiling, dexing, obfuscating, 
aligning.
* It is possible to check code style, catch some bugs and run tests as well.
* It is really easy to use anywhere: IDE, console — it does not really matter.

The current building is based on keeping libraries in the source tree which is 
not a perfect solution.
Maven downloads dependencies and plugins from Maven Central — a repository for 
artifacts (libraries).
It is possible to use other repositories and create new ones of course.

I meant using Maven as a tool, not compiling it when building an application 
(or I don’t understand something).
Maven is a build tool, like make, but with really heavy steroids.

You can look at my open source application as an example of Maven usage [1].
Maven files are pom.xml, application/pom.xml and tests/pom.xml.

The current version of the project uses Ant (yes, we already have a build tool 
inside a build tool so you can build while you build) which will be deprecated 
because there will be a new build system [2].
The new build system is based on Gradle. I decided not to use it now because it 
is kind of a beta.
Google announced Android Studio — IDE based on IntelliJ IDEA and it uses the 
new build system as well.

So my goal is to prepare a transition to the new build system. Migration from 
Maven to Gradle is really easy.
I repeat — Ant will be deprecated, Gradle is not ready enough, so I picked up 
Maven as the best solution at moment.

About Tinderbox. The only command for building an application with Maven is 
“mvn clean package”, so I see no troubles with that.

I am not against of moving mobile apps (Android and iOS) to separate 
repositories.
The only issue I see is a code review process — now it is possible to use 
Gerrit and I do not know is it possible to use it for multiple repositories.

Sorry for the large text — I just want to clarify things.

Regards,
Artur.

[1]: https://github.com/ming13/gambit
[2]: https://developers.google.com/events/io/sessions/325236644___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Takeshi Abe]

 vcl/source/gdi/bitmap.cxx   |   10 +-
 vcl/source/gdi/bitmapex.cxx |2 +-
 vcl/source/gdi/bmpacc3.cxx  |4 ++--
 vcl/source/gdi/cvtsvm.cxx   |2 +-
 vcl/source/gdi/gdimtf.cxx   |4 ++--
 vcl/source/gdi/gfxlink.cxx  |6 +++---
 vcl/source/gdi/graph.cxx|2 +-
 vcl/source/gdi/impvect.cxx  |   26 +-
 vcl/source/gdi/metaact.cxx  |4 ++--
 vcl/source/gdi/octree.cxx   |2 +-
 vcl/source/gdi/outdev.cxx   |4 ++--
 vcl/source/gdi/outdev3.cxx  |   42 +-
 12 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit dbf87e23f96489d9609e3cfcc0e6a2c31d7a14bf
Author: Takeshi Abe 
Date:   Tue Jun 11 09:45:00 2013 +0900

mark as const

Change-Id: I7f3d231d9f82db663a6a0977fa3f250af9dc8991

diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 93fb8c5..671a091 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -29,7 +29,7 @@
 // - pMask -
 // -
 
-static sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 
0x01 };
+static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 
0x02, 0x01 };
 
 // -
 // - NodeCache -
commit 121ea27f55584ece5c18fcb12fe85a63cd69b349
Author: Takeshi Abe 
Date:   Tue Jun 11 09:42:00 2013 +0900

sal_Bool to bool

Change-Id: I5ccddcab097e820d043a41d8fbe3f900fc1079e5

diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 0853cb1..3520159 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include 
 #include 
 #include 
 #include 
@@ -1355,14 +1355,14 @@ sal_Bool Bitmap::Replace( const Bitmap& rMask, const 
Color& rReplaceColor )
 }
 else
 {
-sal_Bool* pFlags = new sal_Bool[ nMaxColors ];
+bool* pFlags = new bool[ nMaxColors ];
 
-// Set all entries to 0
-memset( pFlags, 0, nMaxColors );
+// Set all entries to false
+std::fill( pFlags, pFlags+nMaxColors, false );
 
 for( long nY = 0L; nY < nHeight; nY++ )
 for( long nX = 0L; nX < nWidth; nX++ )
-pFlags[ pAcc->GetPixelIndex( nY, nX ) ] = sal_True;
+pFlags[ pAcc->GetPixelIndex( nY, nX ) ] = true;
 
 for( sal_uInt16 i = 0UL; i < nMaxColors; i++ )
 {
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 61edab7..8e769c1 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -405,7 +405,7 @@ sal_Bool BitmapEx::Rotate( long nAngle10, const Color& 
rFillColor )
 
 if( !!aBitmap )
 {
-const sal_Bool bTransRotate = ( Color( COL_TRANSPARENT ) == rFillColor 
);
+const bool bTransRotate = ( Color( COL_TRANSPARENT ) == rFillColor );
 
 if( bTransRotate )
 {
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 49d971c..791a75d 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -143,7 +143,7 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, 
const Point& rEnd )
 const long  nDYX = ( nDY - nDX ) << 1;
 const long  nDY2 = nDY << 1;
 longnD = nDY2 - nDX;
-sal_BoolbPos = nY1 < nY2;
+boolbPos = nY1 < nY2;
 
 for ( nX = nX1, nY = nY1; nX <= nX2; nX++ )
 {
@@ -182,7 +182,7 @@ void BitmapWriteAccess::DrawLine( const Point& rStart, 
const Point& rEnd )
 const long  nDYX = ( nDX - nDY ) << 1;
 const long  nDY2 = nDX << 1;
 longnD = nDY2 - nDY;
-sal_BoolbPos = nX1 < nX2;
+boolbPos = nX1 < nX2;
 
 for ( nX = nX1, nY = nY1; nY <= nY2; nY++ )
 {
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 63134b4..f7a8c49 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -471,7 +471,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 ::std::stack< LineInfo* > aLIStack;
 VirtualDevice   aFontVDev;
 rtl_TextEncodingeActualCharSet = osl_getThreadTextEncoding();
-sal_BoolbFatLine = sal_False;
+boolbFatLine = false;
 
 // TODO: fix reindentation below if you can accept being blamed by the SCM
 MapMode aMapMode;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 019e18e..1a9c8e9 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1236,7 +1236,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
 }
 e

[PATCH] dev-tools patch for gerrit script (was Re: gerrit daily )

[Mat M]

Hello all

Le Thu, 06 Jun 2013 19:34:03 +0200, Bjoern Michaelsen  
 a écrit:



On Thu, Jun 06, 2013 at 04:48:52PM +0100, Michael Meeks wrote:

+ get the gerrit / mail digest bits setup (Bjoern)
[ in progress, scripts in dev-tools ]


The script is now in a usable state IMHO, but of cause can always be  
improved
(like e.g. using Pythons mail-foo to construct the body, which might  
make sure

getting the encodings right for every client etc.).

Below is the example mail this would send for "right now".

Best,

Bjoern

Example output:
From: ger...@libreoffice.org
To: libreoffice@lists.freedesktop.org
Date: 2013-06-06 19:32:00.740745
Subject: LibreOffice Gerrit news 2013-06-06
Reply-To: libreoffice@lists.freedesktop.org
X-Mailer: LibreOfficeGerritDigestMailer 1.0

Moin!

open changes on master for project core changed in the last 25 hours:
https://gerrit.libreoffice.org/4176 "Sidebar conversion to .ui for  
sidebar-number-format"   prashant3.yi...@gmail.com
https://gerrit.libreoffice.org/4169 fdo#63866 Hid useless  
checkboxesjsnhu...@gmail.com
https://gerrit.libreoffice.org/4165 fdo#46808, Convert xml::crypto  
services to new stylenoelgran...@gmail.com



merged changes on master for project core changed in the last 25 hours:
https://gerrit.libreoffice.org/4174 Prevent out-of-range values coming  
from ListBox GetSelectEntryPos.  javier@gmail.com
https://gerrit.libreoffice.org/4170 Remove RTL_CONSTASCII_(U)STRINGPARAM  
(sd)   chrrossman...@web.de
https://gerrit.libreoffice.org/4151 fdo#41226 Add error handling of  
recursed GetCaseCorrectPathNameEx() saturda...@gmail.com
https://gerrit.libreoffice.org/4153 fdo#60924 autoinstall - gbuild/scp2:  
add base modulemarcos.souza@gmail.com
https://gerrit.libreoffice.org/4171 Fix memory leak in  
Exif::processExif. Delete aExifData when done.   m...@klomp.org
https://gerrit.libreoffice.org/4167 fdo#64350: fix for DOCX export of  
border space  rattles2...@gmail.com



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

None

Open changes needing tweaks, but being untouched for more than a week:
https://gerrit.libreoffice.org/3663 replaced compareTo with  
==  p...@nevitus.com



Best,

Your friendly LibreOffice Gerrit Digest Mailer


my patch is this:
Sanitize the age query parameters with --
Improve layout of mail like:
-8<---
Moin!

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

Rework code after OUString'ification
  in https://gerrit.libreoffice.org/4214 from Matteo Casalin
Simplify SwPaM::GetTxt
  in https://gerrit.libreoffice.org/4213 from Matteo Casalin
groupdialog.ui widget
  in https://gerrit.libreoffice.org/4208 from Manal Alhassoun
fdo#64977 Adding Tibetan Language Support
  in https://gerrit.libreoffice.org/4197 from Élie Roux
...
--->8-

without going beyond 75 chars and with no wrap neither.

Since urls have fixed-length, I put them at start to ahve ~aligned things.

Attached is the patch, because dev-tools does not have the Change-Id hook  
(apparently).


HTH

Mathias

--
Mat M

0001-Improve-mail-formatting-fix-query-parsing.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/human icon-themes/oxygen

[Andras Timar]

 dev/null |binary
 1 file changed

New commits:
commit 6cc510e0ed5b99b1493dc23b49df7351763f7916
Author: Andras Timar 
Date:   Mon Jun 10 21:44:29 2013 +0200

remove unused images

Change-Id: I0090d85bc15ce63af4944c9722b322e192eac757

diff --git a/icon-themes/galaxy/svx/res/nu07.png 
b/icon-themes/galaxy/svx/res/nu07.png
deleted file mode 100644
index 9c7dba0..000
Binary files a/icon-themes/galaxy/svx/res/nu07.png and /dev/null differ
diff --git a/icon-themes/galaxy/svx/res/nu08.png 
b/icon-themes/galaxy/svx/res/nu08.png
deleted file mode 100644
index 0030208..000
Binary files a/icon-themes/galaxy/svx/res/nu08.png and /dev/null differ
diff --git a/icon-themes/human/svx/res/nu07.png 
b/icon-themes/human/svx/res/nu07.png
deleted file mode 100644
index 469975e..000
Binary files a/icon-themes/human/svx/res/nu07.png and /dev/null differ
diff --git a/icon-themes/human/svx/res/nu08.png 
b/icon-themes/human/svx/res/nu08.png
deleted file mode 100644
index 2916dd5..000
Binary files a/icon-themes/human/svx/res/nu08.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/nu07.png 
b/icon-themes/oxygen/svx/res/nu07.png
deleted file mode 100644
index 469975e..000
Binary files a/icon-themes/oxygen/svx/res/nu07.png and /dev/null differ
diff --git a/icon-themes/oxygen/svx/res/nu08.png 
b/icon-themes/oxygen/svx/res/nu08.png
deleted file mode 100644
index cf6fa4c..000
Binary files a/icon-themes/oxygen/svx/res/nu08.png and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/text

[Andras Timar]

 source/text/scalc/02/0606.xhp|2 +-
 source/text/scalc/02/0607.xhp|2 +-
 source/text/shared/00/0004.xhp   |4 ++--
 source/text/shared/01/0222.xhp   |2 +-
 source/text/shared/optionen/01010700.xhp |4 ++--
 source/text/swriter/01/05060201.xhp  |2 +-
 source/text/swriter/02/1404.xhp  |2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ef8fcd86c266e8e7e5ab24ca01687f06d4884707
Author: Andras Timar 
Date:   Mon Jun 10 21:38:40 2013 +0200

fdo#65512 fix missing images

Change-Id: Idde43895488a29352a371bd90de1e21d46da9690

diff --git a/source/text/scalc/02/0606.xhp 
b/source/text/scalc/02/0606.xhp
index 0cadb34..eacdb48 100644
--- a/source/text/scalc/02/0606.xhp
+++ b/source/text/scalc/02/0606.xhp
@@ -44,7 +44,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/scalc/02/0607.xhp 
b/source/text/scalc/02/0607.xhp
index 3c12208..ecca575 100644
--- a/source/text/scalc/02/0607.xhp
+++ b/source/text/scalc/02/0607.xhp
@@ -44,7 +44,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/00/0004.xhp 
b/source/text/shared/00/0004.xhp
index 09418ce..da05d41 100644
--- a/source/text/shared/00/0004.xhp
+++ b/source/text/shared/00/0004.xhp
@@ -255,7 +255,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -270,7 +270,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/01/0222.xhp 
b/source/text/shared/01/0222.xhp
index 9987dba..85c52b1 100644
--- a/source/text/shared/01/0222.xhp
+++ b/source/text/shared/01/0222.xhp
@@ -45,7 +45,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/optionen/01010700.xhp 
b/source/text/shared/optionen/01010700.xhp
index af6bf74..553a95d 100644
--- a/source/text/shared/optionen/01010700.xhp
+++ b/source/text/shared/optionen/01010700.xhp
@@ -119,7 +119,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -135,7 +135,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/swriter/01/05060201.xhp 
b/source/text/swriter/01/05060201.xhp
index 75e3e38..029686d 100644
--- a/source/text/swriter/01/05060201.xhp
+++ b/source/text/swriter/01/05060201.xhp
@@ -49,7 +49,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/swriter/02/1404.xhp 
b/source/text/swriter/02/1404.xhp
index 1a9aefc..2a6b609 100644
--- a/source/text/swriter/02/1404.xhp
+++ b/source/text/swriter/02/1404.xhp
@@ -44,7 +44,7 @@

 
  
-  Icon
+  Icon
  
  
   Apply
___
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' - helpcontent2

[Andras Timar]

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

New commits:
commit 94c59899d91852e5efbe29f85d57fd780e4c4e55
Author: Andras Timar 
Date:   Mon Jun 10 21:38:40 2013 +0200

Updated core
Project: help  ef8fcd86c266e8e7e5ab24ca01687f06d4884707

diff --git a/helpcontent2 b/helpcontent2
index 6ac323f..ef8fcd8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6ac323f654f283339bcf55b802c8ebf3c4065b04
+Subproject commit ef8fcd86c266e8e7e5ab24ca01687f06d4884707
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/text/scalc/02/0606.xhp|2 +-
 source/text/scalc/02/0607.xhp|2 +-
 source/text/shared/00/0004.xhp   |4 ++--
 source/text/shared/01/0222.xhp   |2 +-
 source/text/shared/optionen/01010700.xhp |4 ++--
 source/text/swriter/01/05060201.xhp  |2 +-
 source/text/swriter/02/1404.xhp  |2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 74b25de61eef50245faacac5b07e7e375ba3e5cf
Author: Andras Timar 
Date:   Mon Jun 10 21:38:40 2013 +0200

fdo#65512 fix missing images

Change-Id: Idde43895488a29352a371bd90de1e21d46da9690

diff --git a/source/text/scalc/02/0606.xhp 
b/source/text/scalc/02/0606.xhp
index 0cadb34..eacdb48 100644
--- a/source/text/scalc/02/0606.xhp
+++ b/source/text/scalc/02/0606.xhp
@@ -44,7 +44,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/scalc/02/0607.xhp 
b/source/text/scalc/02/0607.xhp
index 3c12208..ecca575 100644
--- a/source/text/scalc/02/0607.xhp
+++ b/source/text/scalc/02/0607.xhp
@@ -44,7 +44,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/00/0004.xhp 
b/source/text/shared/00/0004.xhp
index 09418ce..da05d41 100644
--- a/source/text/shared/00/0004.xhp
+++ b/source/text/shared/00/0004.xhp
@@ -255,7 +255,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -270,7 +270,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/01/0222.xhp 
b/source/text/shared/01/0222.xhp
index 9987dba..85c52b1 100644
--- a/source/text/shared/01/0222.xhp
+++ b/source/text/shared/01/0222.xhp
@@ -45,7 +45,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/shared/optionen/01010700.xhp 
b/source/text/shared/optionen/01010700.xhp
index af6bf74..553a95d 100644
--- a/source/text/shared/optionen/01010700.xhp
+++ b/source/text/shared/optionen/01010700.xhp
@@ -119,7 +119,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -135,7 +135,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/swriter/01/05060201.xhp 
b/source/text/swriter/01/05060201.xhp
index 75e3e38..029686d 100644
--- a/source/text/swriter/01/05060201.xhp
+++ b/source/text/swriter/01/05060201.xhp
@@ -49,7 +49,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/swriter/02/1404.xhp 
b/source/text/swriter/02/1404.xhp
index 1a9aefc..2a6b609 100644
--- a/source/text/swriter/02/1404.xhp
+++ b/source/text/swriter/02/1404.xhp
@@ -44,7 +44,7 @@

 
  
-  Icon
+  Icon
  
  
   Apply
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit ae05a3e0f116b9a69347a3a8392632914f6ab96c
Author: Andras Timar 
Date:   Mon Jun 10 21:38:40 2013 +0200

Updated core
Project: help  74b25de61eef50245faacac5b07e7e375ba3e5cf

diff --git a/helpcontent2 b/helpcontent2
index ed02574..74b25de 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ed02574e293074b182982a4512884a6f2d7bcc5c
+Subproject commit 74b25de61eef50245faacac5b07e7e375ba3e5cf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Cao Cuong Ngo]

 include/sfx2/dinfdlg.hxx   |7 +--
 sfx2/source/dialog/dinfdlg.cxx |   79 +++--
 sfx2/source/dialog/dinfdlg.hrc |6 +++
 sfx2/source/dialog/dinfdlg.src |   17 
 sfx2/source/inc/sfxlocal.hrc   |1 
 5 files changed, 56 insertions(+), 54 deletions(-)

New commits:
commit fca06947a4997482c3f061f368237dc0d91794ec
Author: Cao Cuong Ngo 
Date:   Fri Jun 7 18:40:11 2013 +0200

CMIS properties dialog

Fix properties type editing

Change-Id: Ic36f0351ec738e7444508f8326c23e89150c9603

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 72d1ed1..397a011 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -588,14 +588,12 @@ public:
 
 struct CmisPropertyLine
 {
-ComboBox  m_aNameBox;
+SelectableFixedText   m_aNameBox;
 CmisPropertiesTypeBox m_aTypeBox;
 CmisPropertiesEditm_aValueEdit;
 CmisPropertiesDateField   m_aDateField;
 CmisPropertiesTimeField   m_aTimeField;
-CmisPropertiesEditButton  m_aEditButton;
 CmisPropertiesYesNoButton m_aYesNoButton;
-
 Point   m_aDatePos;
 Point   m_aTimePos;
 Sizem_aDateTimeSize;
@@ -611,12 +609,11 @@ struct CmisPropertyLine
 class CmisPropertiesWindow : public Window
 {
 private:
-ComboBoxm_aNameBox;
+SelectableFixedText m_aNameBox;
 ListBox m_aTypeBox;
 Editm_aValueEdit;
 DateField   m_aDateField;
 TimeField   m_aTimeField;
-PushButton  m_aEditButton;
 CmisPropertiesYesNoButton   m_aYesNoButton;
 
 sal_Int32   m_nLineHeight;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 7750f28..abd66d6 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2173,12 +2173,11 @@ void CmisPropertiesYesNoButton::Resize()
 
 // struct CmisPropertyLine -
 CmisPropertyLine::CmisPropertyLine( Window* pParent ) :
-m_aNameBox  ( pParent, SfxResId( SFX_CB_PROPERTY_NAME )  ),
-m_aTypeBox  ( pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this ),
+m_aNameBox  ( pParent ),
+m_aTypeBox  ( pParent, SfxResId( SFX_LB_CMIS_PROPERTY_TYPE ), this ),
 m_aValueEdit( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ),
 m_aDateField( pParent, SfxResId( SFX_FLD_DATE), this),
 m_aTimeField( pParent, SfxResId( SFX_FLD_TIME), this),
-m_aEditButton(pParent, SfxResId( SFX_PB_EDIT ), this),
 m_aYesNoButton  ( pParent, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
 m_bTypeLostFocus( false )
 
@@ -2194,12 +2193,11 @@ CmisPropertiesWindow::CmisPropertiesWindow(Window* 
pParent,
 const OUString &rHeaderAccType,
 const OUString &rHeaderAccValue) :
 Window(pParent),
-m_aNameBox  ( this, SfxResId( SFX_CB_PROPERTY_NAME ) ),
-m_aTypeBox  ( this, SfxResId( SFX_LB_PROPERTY_TYPE ) ),
+m_aNameBox  ( this ),
+m_aTypeBox  ( this, SfxResId( SFX_LB_CMIS_PROPERTY_TYPE ) ),
 m_aValueEdit( this, SfxResId( SFX_ED_PROPERTY_VALUE ) ),
 m_aDateField( this, SfxResId( SFX_FLD_DATE) ),
 m_aTimeField( this, SfxResId( SFX_FLD_TIME) ),
-m_aEditButton(this, SfxResId( SFX_PB_EDIT )),
 m_aYesNoButton  ( this, SfxResId( SFX_WIN_PROPERTY_YESNO ) ),
 m_nScrollPos (0),
 m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
@@ -,14 +2220,12 @@ IMPL_LINK( CmisPropertiesWindow, TypeHdl, 
CmisPropertiesTypeBox*, pBox )
 {
 sal_Int64 nType = sal_Int64( (long)pBox->GetEntryData( 
pBox->GetSelectEntryPos() ) );
 CmisPropertyLine* pLine = pBox->GetLine();
-pLine->m_aValueEdit.Show( (CUSTOM_TYPE_TEXT == nType) || 
(CUSTOM_TYPE_NUMBER  == nType) );
-pLine->m_aDateField.Show( (CUSTOM_TYPE_DATE == nType) || 
(CUSTOM_TYPE_DATETIME  == nType) );
-pLine->m_aTimeField.Show( CUSTOM_TYPE_DATETIME  == nType );
-pLine->m_aYesNoButton.Show( CUSTOM_TYPE_BOOLEAN == nType );
+pLine->m_aValueEdit.Show(( CMIS_TYPE_STRING == nType ) || ( 
CMIS_TYPE_NUMBER == nType ) );
+pLine->m_aDateField.Show( CMIS_TYPE_DATETIME  == nType );
+pLine->m_aTimeField.Show( CMIS_TYPE_DATETIME  == nType );
+pLine->m_aYesNoButton.Show( CMIS_TYPE_BOOLEAN == nType );
 
-if ( nType == CUSTOM_TYPE_DATE )
-pLine->m_aDateField.SetPosSizePixel(pLine->m_aValueEdit.GetPosPixel(), 
pLine->m_aValueEdit.GetSizePixel());
-else if ( nType == CUSTOM_TYPE_DATETIME)
+if ( nType == CMIS_TYPE_DATETIME )
 {
 pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos, 
pLine->m_aDateTimeSize );
 pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos, 
pLine->m_a

Re: Limit - New Database feature

[Zolnai Tamás]

Hi Alex,

Thanks for the note. I looked up the thread on german discuss list. The
problem is not that "doesn't insert the required WHERE clause before the
LIMIT" (it sounds like adding a criteria on GUI and this criteria not
inserted into the select statement before the limit clause while running),
but hsqldb does not support queries like "select * from table limit y". In
hsqldb's concept we have to use a WHERE or an ORDER BY clause before LIMIT
or at least a Table alias.

In case of mysql, Base appends a table alias automatically to the select
statement (read on the german list). I don't sure this appending's aim is
to avoid this problem or not, but can use for hsqldb too.

Lionel,
I found a driver property with name "AppendTableAliasInSelect" which seems
to be responsible for appending alias. It is used only in generating
statement in QueryDesignView.cxx, so I think it can be used wihtout any
problem. I can't test whether it works yet, I'm compiling by now, but it
seems to me it works as its name suggests. So if you don't have any
objection to it or don't have a better solution than I solve the problem in
this way.


Best regards,
Tamás

2013/6/10 Alexander Thurgood 

> Le 19/01/13 03:46, Lionel Elie Mamane a écrit :
>
> Hi all,
>
> FYI, there is a report/discussion on the German discuss list that this
> functionality fails with hsqldb embedded databases and current 4.1 beta2
> because it doesn't insert the required WHERE clause before the LIMIT
> operator.
>
> The functionality is reported to work correctly with a msyql db.
>
>
> Alex
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5d/0489240834e9e3c2d860518c1f6e5803f7591d

[Caolán McNamara]

 5d/0489240834e9e3c2d860518c1f6e5803f7591d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61513e3829938802bb178d56086e3e1879dafcf6
Author: Caolán McNamara 
Date:   Mon Jun 10 19:06:09 2013 +0100

Notes added by 'git notes add'

diff --git a/5d/0489240834e9e3c2d860518c1f6e5803f7591d 
b/5d/0489240834e9e3c2d860518c1f6e5803f7591d
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/5d/0489240834e9e3c2d860518c1f6e5803f7591d
@@ -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: writerfilter/source

[Oliver-Rainer Wittmann]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx|   12 +--
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  |3 
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |   62 +
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |   11 +--
 writerfilter/source/ooxml/OOXMLParserState.cxx |3 
 5 files changed, 43 insertions(+), 48 deletions(-)

New commits:
commit d94bda0c1fd3c618b98a63f76d71e129ad06d942
Author: Oliver-Rainer Wittmann 
Date:   Mon Jun 10 16:51:54 2013 +0100

Correct the XML document handler...

which is used to parse Microsoft Word OOXML documents in case of unknown XML
elements

(cherry picked from commit 22e334845346f4e3189c72e706d744385953af19)

Conflicts:
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx

Change-Id: Ibcd3e808abfb35291bb04aa10190a7800f0837fa

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 29c64ad..09ded15 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -66,10 +66,8 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & 
rStreamHandler,
 {
 uno::Reference 
xContext(mpStream->getContext());
 OOXMLFastDocumentHandler * pDocHandler =
-new OOXMLFastDocumentHandler(xContext);
-pDocHandler->setStream(&rStreamHandler);
-pDocHandler->setDocument(this);
-pDocHandler->setXNoteId(mnXNoteId);
+new OOXMLFastDocumentHandler(
+xContext, &rStreamHandler, this, mnXNoteId );
 
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
@@ -317,10 +315,8 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 uno::Reference 
xContext(mpStream->getContext());
 
 OOXMLFastDocumentHandler * pDocHandler =
-new OOXMLFastDocumentHandler(xContext);
-pDocHandler->setStream(&rStream);
-pDocHandler->setDocument(this);
-pDocHandler->setXNoteId(mnXNoteId);
+new OOXMLFastDocumentHandler(
+xContext, &rStream, this, mnXNoteId );
 pDocHandler->setIsSubstream( mbIsSubstream );
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index fc6eb3e..3adc48b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1340,9 +1340,6 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
-SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
-if (!mpStream)
-return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index f6f6b60..893ed74 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -35,10 +35,28 @@ using namespace ::com::sun::star;
 using namespace ::std;
 
 
-OOXMLFastDocumentHandler::OOXMLFastDocumentHandler
-(uno::Reference< uno::XComponentContext > const & context)
-: m_xContext(context), mpStream(0), mpDocument(0)
-{}
+OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
+uno::Reference< uno::XComponentContext > const & context,
+Stream* pStream,
+OOXMLDocument* pDocument,
+sal_Int32 nXNoteId )
+: m_xContext(context)
+, mpStream( pStream )
+#ifdef DEBUG_ELEMENT
+, mpTmpStream()
+#endif
+, mpDocument( pDocument )
+, mnXNoteId( nXNoteId )
+, mpContextHandler()
+{
+#ifdef DEBUG_PROTOCOL
+if ( pStream )
+{
+mpTmpStream.reset( new StreamProtocol( pStream, debug_logger ) );
+mpStream = mpTmpStream.get();
+}
+#endif
+}
 
 // ::com::sun::star::xml::sax::XFastContextHandler:
 void SAL_CALL OOXMLFastDocumentHandler::startFastElement
@@ -141,6 +159,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
  << endl;
 #endif
 
+if ( mpStream == 0 && mpDocument == 0 )
+{
+// document handler has been created as unknown child - see 

+// --> do not provide a child context
+return NULL;
+}
+
 return 
OOXMLFactory::getInstance()->createFastChildContextFromStart(getContextHandler().get(),
 Element);
 }
 
@@ -167,13 +192,12 @@ Name
 #endif
 
 return uno::Reference< xml::sax::XFastContextHandler >
-(new OOXMLFastDocumentHandler(m_xContext));
+( new OOXMLFastDocumentHandler( m_xContext, 0, 0, 0 ) );
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::ch

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

[Caolán McNamara]

 22/e334845346f4e3189c72e706d744385953af19 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ca3c482803ba7f5d8087faf8d5e973c7cbcd2916
Author: Caolán McNamara 
Date:   Mon Jun 10 19:05:19 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: 3 commits - cli_ure/Library_cli_uno.mk jvmfwk/Module_jvmfwk.mk Makefile.in Repository.mk scp2/AutoInstallLibs.mk scp2/AutoInstall.mk scp2/inc scp2/Module_scp2.mk scp2/s

[Matúš Kukan]

 Makefile.in|2 
 Repository.mk  |   41 ++-
 cli_ure/Library_cli_uno.mk |2 
 jvmfwk/Module_jvmfwk.mk|2 
 scp2/AutoInstall.mk|   24 
 scp2/AutoInstallLibs.mk|   24 
 scp2/Module_scp2.mk|2 
 scp2/inc/macros.inc|8 ++
 scp2/source/base/module_base.scp   |4 -
 scp2/source/gnome/module_gnome.scp |4 -
 scp2/source/graphicfilter/module_graphicfilter.scp |4 -
 scp2/source/impress/module_impress.scp |4 -
 scp2/source/kde/module_kde.scp |4 -
 scp2/source/math/module_math.scp   |4 -
 scp2/source/onlineupdate/module_onlineupdate.scp   |4 -
 scp2/source/ooo/module_hidden_ooo.scp  |4 -
 scp2/source/ooo/ure.scp|   35 +---
 scp2/source/tde/module_tde.scp |4 -
 scp2/source/writer/module_writer.scp   |4 -
 solenv/gbuild/AllLangResTarget.mk  |   16 +
 solenv/gbuild/AutoInstall.mk   |   55 
 solenv/gbuild/AutoInstallLibs.mk   |   51 --
 solenv/gbuild/CliNativeLibrary.mk  |2 
 solenv/gbuild/Helper.mk|   11 ++--
 solenv/gbuild/InstallModuleTarget.mk   |2 
 solenv/gbuild/Library.mk   |1 
 solenv/gbuild/LinkTarget.mk|   57 ++---
 solenv/gbuild/TargetLocations.mk   |   16 +
 solenv/gbuild/gbuild.mk|2 
 29 files changed, 165 insertions(+), 228 deletions(-)

New commits:
commit 7a878f9c5fde18e1e86ee0784d9a7f1252700e74
Author: Matúš Kukan 
Date:   Mon Jun 10 00:56:28 2013 +0200

gbuild: s/AutoInstallLibs/AutoInstall/g

Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a

diff --git a/Makefile.in b/Makefile.in
index 0fde85c..7dde471 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,7 +100,7 @@ $(eval $(call gbuild_modules_rules,$(gbuild_modules)))
 gbuild_TARGETS := AllLangHelp \
AllLangPackage \
AllLangResTarget \
-   AutoInstallLibs \
+   AutoInstall \
CliLibrary \
CliNativeLibrary \
CliUnoApiTarget \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
new file mode 100644
index 000..a6dad3c
--- /dev/null
+++ b/scp2/AutoInstall.mk
@@ -0,0 +1,24 @@
+# -*- 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_AutoInstall_AutoInstall))
+
+$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk
deleted file mode 100644
index 6363fb1..000
--- a/scp2/AutoInstallLibs.mk
+++ /dev/null
@@ -1,24 +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_AutoInstallLibs_AutoInstallLibs))
-
-$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE))
-$(eval $(c

[Libreoffice-commits] dev-tools.git: scripts/rtf-anonymiser.py

[Miklos Vajna]

 scripts/rtf-anonymiser.py |  113 ++
 1 file changed, 113 insertions(+)

New commits:
commit d2dcf2d511d8d6c83fba8c1e33b09fc5e6242fb6
Author: Miklos Vajna 
Date:   Mon Jun 10 18:21:39 2013 +0200

import rtf-anonymiser

Handy when someone mails you some bugdoc and you want to convert it to
an fdo attachement, but the content is sensitive.

Change-Id: I4f4615c0c37279064e4e0d814a04fc55525c73a5

diff --git a/scripts/rtf-anonymiser.py b/scripts/rtf-anonymiser.py
new file mode 100755
index 000..de8a596
--- /dev/null
+++ b/scripts/rtf-anonymiser.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python2
+#
+# 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/.
+#
+
+
+import sys, getopt
+
+def usage(code):
+print("Usage: %s [-i|--inline] input.rtf" % sys.argv[0])
+sys.exit(code)
+
+class RtfParser:
+"""This is meant to be a lightweight generic RTF parser. The purpose of
+this class is to provide methods to be overloaded for subclasses."""
+def __init__(self, input, inline):
+self.sock = open(input)
+self.out = []
+self.hexCount = 0
+
+while True:
+ch = self.sock.read(1)
+if not len(ch):
+break
+if ch in ("{", "}", chr(0x0d), chr(0x0a)):
+self.out.append(ch)
+elif ch == "\\":
+self.handleKeyword()
+else:
+self.handleChar(ch)
+
+self.sock.close()
+
+if not inline:
+sys.stdout.write("".join(self.out))
+else:
+self.sock = open(input, "w")
+self.sock.write("".join(self.out))
+self.sock.close()
+
+def handleKeyword(self):
+ch = self.sock.read(1)
+if not len(ch):
+return
+self.out.append("\\")
+if not ch.isalpha():
+if ch == "'":
+self.hexCount = 2
+self.out.append(ch)
+return
+while ch.isalpha():
+self.out.append(ch)
+ch = self.sock.read(1)
+if ch == "-":
+self.out.append(ch)
+ch = self.sock.read(1)
+if ch.isdigit():
+while ch.isdigit():
+self.out.append(ch)
+ch = self.sock.read(1)
+if ch == " ":
+self.handleChar(ch)
+else:
+self.sock.seek(self.sock.tell() - 1)
+
+def handleHexChar(self, ch):
+self.hexCount -= 1
+self.out.append(ch)
+
+def handleChar(self, ch):
+if self.hexCount > 0:
+self.handleHexChar(ch)
+else:
+self.out.append(ch)
+
+class RtfAnonymiser(RtfParser):
+"""This class only overloads handleChar() -- hopefully this removes all
+sensitive contents."""
+def __init__(self, input, inline):
+RtfParser.__init__(self, input, inline)
+
+def handleChar(self, ch):
+if self.hexCount > 0:
+self.handleHexChar(ch)
+else:
+if ch.isupper():
+self.out.append("X")
+else:
+self.out.append("x")
+
+# opt parsing
+inline = False
+argv = sys.argv[1:]
+try:
+opts, args = getopt.getopt(argv, "i", ["inline"])
+except getopt.GetoptError:
+usage(0)
+optind = 0
+for opt, arg in opts:
+if opt in ("-i", "--inline"):
+inline = True
+optind += 1
+
+if optind < len(argv):
+input = argv[optind]
+else:
+usage(0)
+
+RtfAnonymiser(input, inline)
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/setsdkenv_windows.template solenv/bin

[Jürgen Schmidt]

 odk/setsdkenv_windows.template |   20 
 solenv/bin/srcrelease.xml  |8 +---
 2 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 5d0489240834e9e3c2d860518c1f6e5803f7591d
Author: Jürgen Schmidt 
Date:   Mon Jun 10 14:42:09 2013 +

#122504# rename src release sfile name to from aoo-... to 
apache-openoffice-...

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 2d57082..3540cda 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -25,7 +25,8 @@
   
 
   
-  
+  
+  
   
 
   
@@ -41,8 +42,9 @@
   
 
   
-
-
+
+
+
 
 
 
commit 8810e06850ee218d4b3059aa33b5058dfcab853c
Author: Jürgen Schmidt 
Date:   Mon Jun 10 14:05:20 2013 +

#122477# add missing license header

diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index cc5e7c4..631d9c9 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,3 +1,23 @@
+rem *
+rem  
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements.  See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership.  The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License.  You may obtain a copy of the License at
+rem  
+remhttp://www.apache.org/licenses/LICENSE-2.0
+rem  
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied.  See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+rem  
+rem *
 @echo off
 REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/uiconfig/swriter/ui/footendnotedialog.ui |  118 
 1 file changed, 118 insertions(+)

New commits:
commit f01e27126d3fde9429611c68fcbed9da71b36d17
Author: Caolán McNamara 
Date:   Mon Jun 10 16:49:54 2013 +0100

missing .ui

Change-Id: I549bba35a983a61aedf6f0ff9709b0efc14a603a

diff --git a/sw/uiconfig/swriter/ui/footendnotedialog.ui 
b/sw/uiconfig/swriter/ui/footendnotedialog.ui
new file mode 100644
index 000..fcc3efd
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/footendnotedialog.ui
@@ -0,0 +1,118 @@
+
+
+  
+  
+False
+6
+Footnotes/Endnotes 
Settings
+dialog
+
+  
+False
+vertical
+12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+True
+True
+True
+
+  
+
+
+  
+True
+False
+Footnotes
+  
+  
+False
+  
+
+
+  
+
+
+  
+True
+False
+Endnotes
+  
+  
+1
+False
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+
+
+  ok
+  cancel
+  help
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit da041e7deca1f2049bcaed75ab5ea3c6c690eaed
Author: Caolán McNamara 
Date:   Mon Jun 10 16:45:47 2013 +0100

Notes added by 'git notes add'

diff --git a/cd/f48cfdbdb5348b259f4632790ffd178fcad1f7 
b/cd/f48cfdbdb5348b259f4632790ffd178fcad1f7
new file mode 100644
index 000..6528fa8
--- /dev/null
+++ b/cd/f48cfdbdb5348b259f4632790ffd178fcad1f7
@@ -0,0 +1 @@
+merged as: 744244997da79ca95278249eeadf716730fffd82
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 basegfx/source/vector/b2dvector.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 744244997da79ca95278249eeadf716730fffd82
Author: Armin Le Grand 
Date:   Mon Jun 10 12:45:36 2013 +

Resolves: #i122509# Corrected typo in basegfx

(cherry picked from commit cdf48cfdbdb5348b259f4632790ffd178fcad1f7)

Change-Id: Iaa62acc4901c3edd31d0af7c642327dddf07f562

diff --git a/basegfx/source/vector/b2dvector.cxx 
b/basegfx/source/vector/b2dvector.cxx
index 5628bbe..e5ac9bf 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.cxx
@@ -112,7 +112,7 @@ namespace basegfx
 
 if(!fTools::equalZero(fLenNow))
 {
-const double fOne(10.0);
+const double fOne(1.0);
 
 if(!fTools::equal(fOne, fLenNow))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/UIConfig_swriter.mk

[Caolán McNamara]

 sw/AllLangResTarget_sw.mk |1 
 sw/UIConfig_swriter.mk|1 
 sw/inc/swabstdlg.hxx  |2 -
 sw/source/ui/dialog/swdlgfact.cxx |   18 ++---
 sw/source/ui/dialog/swdlgfact.hxx |2 -
 sw/source/ui/inc/docfnote.hxx |4 ++
 sw/source/ui/inc/frmui.hrc|3 --
 sw/source/ui/inc/misc.hrc |1 
 sw/source/ui/misc/docfnote.cxx|   19 +
 sw/source/ui/misc/docfnote.src|   52 --
 sw/source/ui/shells/annotsh.cxx   |2 -
 sw/source/ui/shells/drawsh.cxx|2 -
 sw/source/ui/shells/drwtxtex.cxx  |2 -
 sw/source/ui/shells/frmsh.cxx |2 -
 sw/source/ui/shells/textsh1.cxx   |2 -
 15 files changed, 21 insertions(+), 92 deletions(-)

New commits:
commit 1ecae380c85f891811923462d577a2e4f7bfb4d7
Author: Caolán McNamara 
Date:   Mon Jun 10 16:28:18 2013 +0100

convert foot/endnote dialog to .ui

Change-Id: Ib2f267b85b04be91b7e9091613b0665a1eea3f01

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 1b16550..ceeb41b 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -126,7 +126,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
 sw/source/ui/index/idxmrk.src \
 sw/source/ui/index/multmrk.src \
 sw/source/ui/lingu/olmenu.src \
-sw/source/ui/misc/docfnote.src \
 sw/source/ui/misc/glossary.src \
 sw/source/ui/misc/numberingtypelistbox.src \
 sw/source/ui/misc/redlndlg.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 89e6eac..7cf200e 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/editsectiondialog \
sw/uiconfig/swriter/ui/exchangedatabases \
sw/uiconfig/swriter/ui/formattablepage \
+   sw/uiconfig/swriter/ui/footendnotedialog \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
sw/uiconfig/swriter/ui/indexentry \
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2e8ae75..a7563b8 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -348,7 +348,7 @@ public:
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> 
rxSource,
 
com::sun::star::uno::Reference 
xColSupp,
 const SwDBData& rData,  int nResId) = 0;
-virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent, 
SwWrtShell &rSh,int nResId) = 0;//add for  SwFootNoteOptionDlg
+virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, 
SwWrtShell &rSh) = 0;//add for  SwFootNoteOptionDlg
 
 //add for DropDownFieldDialog
 virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window 
*pParent, SwWrtShell &rSh,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 0f5a859..81f62b1 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -759,22 +759,10 @@ AbstractSwInsertDBColAutoPilot* 
SwAbstractDialogFactory_Impl::CreateSwInsertDBCo
 return 0;
 }
 
-SfxAbstractTabDialog *  
SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg( Window *pParent, 
SwWrtShell &rSh,int nResId)
+SfxAbstractTabDialog *  
SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(Window *pParent, 
SwWrtShell &rSh)
 {
-SfxTabDialog* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_DOC_FOOTNOTE :
-pDlg = new SwFootNoteOptionDlg( pParent, rSh );
-break;
-
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractTabDialog_Impl( pDlg );
-return 0;
+SfxTabDialog* pDlg = new SwFootNoteOptionDlg( pParent, rSh );
+return new AbstractTabDialog_Impl( pDlg );
 }
 
 //add for DropDownFieldDialog
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 7ca57c2..c46abe6 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -452,7 +452,7 @@ public:
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> 
rxSource,
 
com::sun::star::uno::Reference 
xColSupp,
 const SwDBData& rData,  int nResId);
-virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent, 
SwWrtShell &rSh,int nResId);//add for  SwFootNoteOptionDlg
+virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, 
SwWrtShell &rSh);//add for  SwFootNoteOptionDlg
 
 //add for DropDownFieldDialog
 virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window 
*pParent, SwWrtShell &rSh,
diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/ui/inc/docfnote.hxx
index 2ccd6fd..154bb01 100644
--- a/sw/source/ui/inc/docfnote.hxx
+++ b/sw/source/ui/inc/docfnote.hxx
@@ -28,13 +28,15 @@ class SwFootNoteOptionDlg :public SfxTabDialog
 SwWrtShell &rSh;
 Link aOldOkHdl;
 
+sal_uInt1

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

[Fridrich Štrba]

 solenv/gbuild/platform/WNT_INTEL_GCC.mk  |   15 +++
 solenv/gbuild/platform/WNT_X86_64_GCC.mk |2 +-
 solenv/gbuild/platform/mingw.mk  |   12 
 3 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 8df088781c53221498e762f570d21948b7de2650
Author: Fridrich Å trba 
Date:   Mon Jun 10 17:28:13 2013 +0200

Unbreak back MinGW64 build

Change-Id: I68410bc1a8b77877b07f60e6ace0f54c255de95f

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 7fec33c..49b0103 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -25,6 +25,21 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 include $(GBUILDDIR)/platform/windows.mk
 
+# This has to do something with calling conventions, which are different
+# for x86 and x64. Don't put it in the common part since it is breaking
+# and conde that uses boost::bind
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \
+'{ print $$1*1+$$2*100+$$3 }')
+gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
+
+# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL
+# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7,
+# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for
+# uses of boost::bind with functions annotated with SAL_CALL:
+ifeq ($(gb_GccLess470),0)
+gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
+endif
+
 include $(GBUILDDIR)/platform/mingw.mk
 
 include $(GBUILDDIR)/platform/com_GCC_class.mk
diff --git a/solenv/gbuild/platform/WNT_X86_64_GCC.mk 
b/solenv/gbuild/platform/WNT_X86_64_GCC.mk
index 4466b05..4d2ab00 100644
--- a/solenv/gbuild/platform/WNT_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/WNT_X86_64_GCC.mk
@@ -18,7 +18,7 @@
 #
 
 gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CPUDEFS := -D_M_AMD64
+gb_CPUDEFS := -D_M_AMD64 -D_M_X64
 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 
 # please make generic modifications to either of these
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index 7a81b93..2a15506 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -19,10 +19,6 @@
 
 gb_PROGRAMDIRNAME := program
 
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \
-'{ print $$1*1+$$2*100+$$3 }')
-gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
-
 gb_RC := $(WINDRES)
 
 gb_COMPILERDEFS += \
@@ -31,14 +27,6 @@ gb_COMPILERDEFS += \
-D_MSC_EXTENSIONS \
-D_FORCENAMELESSUNION \
 
-# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL
-# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7,
-# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for
-# uses of boost::bind with functions annotated with SAL_CALL:
-ifeq ($(gb_GccLess470),0)
-gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
-endif
-
 gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
___
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' - sw/source

[Miklos Vajna]

 sw/source/core/layout/trvlfrm.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 1a2bfc240f3ba37280e91b0267e41963fd12
Author: Miklos Vajna 
Date:   Mon Jun 10 14:48:59 2013 +0200

bnc#802888 SwPageFrm: one more clickable field fix

This is similar to a996678ed30804e16103e1cfdc439c8546e5d3b0. If we have
both a background object and some clickable field to select, we should
always prefer the clickable field.

This time, the problem was to click on a clickable field, when the
cursor was in normal text and we had a full-page background object.

Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd
(cherry picked from commit 721baad94ee81d9d6281edb93ee45936f6e0e496)

Conflicts:
sw/source/core/layout/trvlfrm.cxx

diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 517cb84..6e60864 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -258,13 +258,28 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 }
 }
 
+bool bConsiderBackground = true;
+SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
+// If the text position is a clickable field, then that should have 
priority.
+if (pTextNd->IsTxtNode())
+{
+SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
+SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+if (pTxtAttr)
+{
+const SwField* pField = pTxtAttr->GetFld().GetFld();
+if (pField->IsClickable())
+bConsiderBackground = false;
+}
+}
+
 // Check objects in the background if nothing else matched
 if ( GetSortedObjs() )
 {
 bBackRet = lcl_GetCrsrOfst_Objects( this, true, &aBackPos, rPoint, 
pCMS );
 }
 
-if ( ( bTestBackground && bBackRet ) || !bTextRet )
+if ( ( bConsiderBackground && bTestBackground && bBackRet ) || 
!bTextRet )
 {
 bRet = bBackRet;
 (*pPos) = aBackPos;
@@ -280,7 +295,6 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
  * text and brackground object, then we compute the distance 
between both
  * would-be positions and the click point. The shortest distance 
wins.
  */
-SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
 double nTextDistance = 0;
 bool bValidTextDistance = false;
 if ( pTextNd )
@@ -293,20 +307,6 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 bValidTextDistance = true;
 }
 
-bool bConsiderBackground = true;
-// If the text position is a clickable field, then that should 
have priority.
-if (pTextNd->IsTxtNode())
-{
-SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
-SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
-if (pTxtAttr)
-{
-const SwField* pField = pTxtAttr->GetFld().GetFld();
-if (pField->IsClickable())
-bConsiderBackground = false;
-}
-}
-
 double nBackDistance = 0;
 bool bValidBackDistance = false;
 SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( );
___
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' - expat/StaticLibrary_expat.mk openssl/ExternalProject_openssl.mk

[Stephan Bergmann]

 expat/StaticLibrary_expat.mk   |1 -
 openssl/ExternalProject_openssl.mk |3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b7cf9c7b933fdc2dcd61e59c0022a066a8717b27
Author: Stephan Bergmann 
Date:   Mon Jun 10 15:49:28 2013 +0200

Revert "fix gold warning about hidden symbols"

This reverts commit 9ff0ee4905068cbc85acf85da1b3ef762b324ed7.  Whatever the 
gold
warnings are exactly, this is apparently not the right fix.

The change to openssl/ExternalProject_openssl.mk caused crashes when LO's
libneon.so, statically linking in LO's libssl.a, started to export symbols 
like
SSLv23_client_method as global, competing with the same symbol from a 
system's
libssl.so.  See the mail thread starting at

"strange crash in SSL code while opening some documents."

Whether the change to expat/StaticLibrary_expat.mk caused similar problems 
is
not clear to me, but it is probably best to revert both to be on the save 
side,
and see what exactly the gold warning was about and how to fix it the right 
way
if it ever shows up again.

(cherry picked from commit d257209a5443e27cefc8872151d776767605cbae)

Change-Id: I3c129f4b357ce8f1cc97185b4fa01ea535825f6f

diff --git a/expat/StaticLibrary_expat.mk b/expat/StaticLibrary_expat.mk
index 1c02e02..2f75452 100644
--- a/expat/StaticLibrary_expat.mk
+++ b/expat/StaticLibrary_expat.mk
@@ -45,7 +45,6 @@ endif
 # suppress warning spam
 $(eval $(call gb_StaticLibrary_add_cflags,expat,\
-w \
-   $(if $(filter GCC,$(COM)),-fvisibility=default) \
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 87397fe..ed99fe5 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -85,6 +85,9 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include 
-L$(SYSBASE)/usr/lib \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) build_libs \
+   CC="$(CC) $(if $(filter-out WNT,$(OS)),\
+   $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
+   -fvisibility=hidden))" \
)
 endif
 # 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: configure.ac

[François Tigeot]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdd6008def896b5f1f7448553bd2985e6252ed60
Author: François Tigeot 
Date:   Thu May 30 09:50:46 2013 +0200

The only OS graphite is not available on is MacOS X

Change-Id: Id63520c60bd4c7f44c271fdb2a832627c42b8738

diff --git a/configure.ac b/configure.ac
index 070b0a45..8660222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8380,7 +8380,7 @@ dnl Graphite
 dnl ===
 
 AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" 
-o "$enable_graphite" != "no"; then
+if test "$_os" != "Darwin" && test "$enable_graphite" = "" -o 
"$enable_graphite" != "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_GRAPHITE="TRUE"
 AC_DEFINE(ENABLE_GRAPHITE)
___
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' - sw/source

[Miklos Vajna]

 sw/source/core/layout/trvlfrm.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 6370599f00d614734cbb0920081c85f72e931ca9
Author: Miklos Vajna 
Date:   Mon Jun 10 14:48:59 2013 +0200

bnc#802888 SwPageFrm: one more clickable field fix

This is similar to a996678ed30804e16103e1cfdc439c8546e5d3b0. If we have
both a background object and some clickable field to select, we should
always prefer the clickable field.

This time, the problem was to click on a clickable field, when the
cursor was in normal text and we had a full-page background object.

(cherry picked from commit 721baad94ee81d9d6281edb93ee45936f6e0e496)

Conflicts:
sw/source/core/layout/trvlfrm.cxx

Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd

diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 0fa03e1..05935ba 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -269,13 +269,28 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 }
 }
 
+bool bConsiderBackground = true;
+SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
+// If the text position is a clickable field, then that should have 
priority.
+if (pTextNd && pTextNd->IsTxtNode())
+{
+SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
+SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+if (pTxtAttr)
+{
+const SwField* pField = pTxtAttr->GetFld().GetFld();
+if (pField->IsClickable())
+bConsiderBackground = false;
+}
+}
+
 // Check objects in the background if nothing else matched
 if ( GetSortedObjs() )
 {
 bBackRet = lcl_GetCrsrOfst_Objects( this, true, &aBackPos, rPoint, 
pCMS );
 }
 
-if ( ( bTestBackground && bBackRet ) || !bTextRet )
+if ( ( bConsiderBackground && bTestBackground && bBackRet ) || 
!bTextRet )
 {
 bRet = bBackRet;
 (*pPos) = aBackPos;
@@ -291,7 +306,6 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
  * text and brackground object, then we compute the distance 
between both
  * would-be positions and the click point. The shortest distance 
wins.
  */
-SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
 double nTextDistance = 0;
 bool bValidTextDistance = false;
 if ( pTextNd )
@@ -304,20 +318,6 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 bValidTextDistance = true;
 }
 
-bool bConsiderBackground = true;
-// If the text position is a clickable field, then that should 
have priority.
-if (pTextNd->IsTxtNode())
-{
-SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
-SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
-if (pTxtAttr)
-{
-const SwField* pField = pTxtAttr->GetFld().GetFld();
-if (pField->IsClickable())
-bConsiderBackground = false;
-}
-}
-
 double nBackDistance = 0;
 bool bValidBackDistance = false;
 SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 basegfx/source/vector/b2dvector.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdf48cfdbdb5348b259f4632790ffd178fcad1f7
Author: Armin Le Grand 
Date:   Mon Jun 10 12:45:36 2013 +

i122509 Corrected typo in basegfx

diff --git a/basegfx/source/vector/b2dvector.cxx 
b/basegfx/source/vector/b2dvector.cxx
index bd1d033..8b613dd 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.cxx
@@ -118,7 +118,7 @@ namespace basegfx
 
 if(!fTools::equalZero(fLenNow))
 {
-const double fOne(10.0);
+const double fOne(1.0);
 
 if(!fTools::equal(fOne, fLenNow))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: expat/StaticLibrary_expat.mk openssl/ExternalProject_openssl.mk

[Stephan Bergmann]

 expat/StaticLibrary_expat.mk   |1 -
 openssl/ExternalProject_openssl.mk |3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d257209a5443e27cefc8872151d776767605cbae
Author: Stephan Bergmann 
Date:   Mon Jun 10 15:49:28 2013 +0200

Revert "fix gold warning about hidden symbols"

This reverts commit 9ff0ee4905068cbc85acf85da1b3ef762b324ed7.  Whatever the 
gold
warnings are exactly, this is apparently not the right fix.

The change to openssl/ExternalProject_openssl.mk caused crashes when LO's
libneon.so, statically linking in LO's libssl.a, started to export symbols 
like
SSLv23_client_method as global, competing with the same symbol from a 
system's
libssl.so.  See the mail thread starting at

"strange crash in SSL code while opening some documents."

Whether the change to expat/StaticLibrary_expat.mk caused similar problems 
is
not clear to me, but it is probably best to revert both to be on the save 
side,
and see what exactly the gold warning was about and how to fix it the right 
way
if it ever shows up again.

diff --git a/expat/StaticLibrary_expat.mk b/expat/StaticLibrary_expat.mk
index 1c02e02..2f75452 100644
--- a/expat/StaticLibrary_expat.mk
+++ b/expat/StaticLibrary_expat.mk
@@ -45,7 +45,6 @@ endif
 # suppress warning spam
 $(eval $(call gb_StaticLibrary_add_cflags,expat,\
-w \
-   $(if $(filter GCC,$(COM)),-fvisibility=default) \
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 87397fe..ed99fe5 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -85,6 +85,9 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include 
-L$(SYSBASE)/usr/lib \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) build_libs \
+   CC="$(CC) $(if $(filter-out WNT,$(OS)),\
+   $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
+   -fvisibility=hidden))" \
)
 endif
 # 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: helpcontent2

[Caolán McNamara]

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

New commits:
commit 9734135dc8ea3458972b9408d1732d4a49843f14
Author: Caolán McNamara 
Date:   Mon Jun 10 14:52:19 2013 +0100

Updated core
Project: help  ed02574e293074b182982a4512884a6f2d7bcc5c

diff --git a/helpcontent2 b/helpcontent2
index 62d0834..ed02574 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 62d083404f888fa33ad1264c59b46ae8a6278e91
+Subproject commit ed02574e293074b182982a4512884a6f2d7bcc5c
___
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

[Caolán McNamara]

 helpers/help_hid.lst |   19 -
 source/text/shared/optionen/01070400.xhp |   60 +++
 2 files changed, 30 insertions(+), 49 deletions(-)

New commits:
commit ed02574e293074b182982a4512884a6f2d7bcc5c
Author: Caolán McNamara 
Date:   Mon Jun 10 14:52:19 2013 +0100

update help ids for draw/impress print options .ui conversion

Change-Id: I772cfbfc9db7c3f84b7329c9c8b19a27bd7df638

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f9f3698..45b64de 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3413,7 +3413,6 @@ HID_SD_NAVIGATOR_TLB,59793,
 HID_SD_OPTIONS_LAYOUT,59788,
 HID_SD_OPTIONS_SNAP,59769,
 HID_SD_PAGEOBJSTLB,59895,
-HID_SD_PRINT_OPTIONS,59768,
 HID_SD_RECENT_MASTERS,59907,
 HID_SD_RULER_HORIZONTAL,59960,
 HID_SD_RULER_VERTICAL,59961,
@@ -6780,17 +6779,6 @@ 
sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_AUTORESTART,878822408,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_END,878822407,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_START,878822406,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_ENTRANCE_CBX_PREVIEW,878871556,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_BACK,545866765,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_DATE,545866755,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_DRAW,545866758,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_FRONT,545866764,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_HANDOUTS,545866760,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_HIDDEN_PAGES,545866753,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_NOTES,545866759,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_OUTLINE,545866761,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_PAGENAME,545866754,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_PAPERBIN,545866762,
-sd_CheckBox_TP_PRINT_OPTIONS_CBX_TIME,545866756,
 sd_Checkbox_DLG_CUSTOMANIMATION_SCHEMES_PANE_4,1415742468,
 sd_Checkbox_RID_TP_CUSTOMANIMATION_TEXT_CBX_ANIMATE_FORM,878855173,
 sd_Checkbox_RID_TP_CUSTOMANIMATION_TEXT_CBX_GROUP_AUTO,878855171,
@@ -6936,13 +6924,6 @@ 
sd_RadioButton_RID_SD_TABPAGE_HEADERFOOTER_RB_DATETIME_AUTOMATIC,553255429,
 sd_RadioButton_RID_SD_TABPAGE_HEADERFOOTER_RB_DATETIME_FIXED,553255427,
 sd_RadioButton_RID_TP_CUSTOMANIMATION_DURATION_RB_CLICKSEQUENCE,878838283,
 sd_RadioButton_RID_TP_CUSTOMANIMATION_DURATION_RB_INTERACTIVE,878838284,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_BLACKWHITE,545866247,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_BOOKLET,545866244,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_COLOR,545866245,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_DEFAULT,545866241,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_GRAYSCALE,545866246,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_PAGESIZE,545866242,
-sd_RadioButton_TP_PRINT_OPTIONS_RBT_PAGETILE,545866243,
 sd_TabPage_RID_SD_TABPAGE_HEADERFOOTER,553254912,
 sd_TabPage_RID_TP_CUSTOMANIMATION_DURATION,878837760,
 sd_TabPage_RID_TP_CUSTOMANIMATION_EFFECT,878821376,
diff --git a/source/text/shared/optionen/01070400.xhp 
b/source/text/shared/optionen/01070400.xhp
index 6843526..044fdfe 100644
--- a/source/text/shared/optionen/01070400.xhp
+++ b/source/text/shared/optionen/01070400.xhp
@@ -44,51 +44,51 @@
 fitting to pages; print settings in 
presentations
 printing; tiling pages in presentations
 MW made "page name printing..." a two level entry
-Print
-Specifies print settings within a 
drawing or presentation document.
+Print
+Specifies print 
settings within a drawing or presentation document.
 
 
 
 removed contents-to-print section for impress, 
i85723Print
 Defines additional elements to be printed on the page 
margin.
-Page name
-Specifies 
whether to print the page name.
-Date
-Specifies 
whether to print the current date.
-Time
-Specifies 
whether to print the current time.
-Hidden pages
-Specifies whether to print 
the pages that are currently hidden from the presentation.
+Page name
+Specifies 
whether to print the page name.
+Date
+Specifies whether 
to print the current date.
+Time
+Specifies whether 
to print the current time.
+Hidden pages
+Specifies 
whether to print the pages that are currently hidden from the 
presentation.
 Quality
 See also .
-Default
-Specifies 
that you want to print in original colors.
-Grayscale
-Specifies that you want to 
print colors as grayscale.
-Black & white
-Specifies that you want to 
print the document in black and white.
+Default
+Specifies that 
you want to print in original colors.
+Grayscale
+Specifies 
that you want to print colors as grayscale.
+Black & white
+Specifies 
that you want to print the document in black and white.
 Page options
 Define additional options for printing the pages.
-Default
-Specifies 
that you do not want to further scale pages when printing.
-Fit to page
+Default
+Specifies 
that you do not want to further scale pages when printing.
+Fit to page
 
-Specifies 
whether to scale down objects that are beyond the margins of the current 
printer, so that they fit on the paper in the printer.
+Specifies 
whether to scale down objects that are beyond the margins of the current 
printer, so that they fit on the paper in the printer.
 
 
-Tile pages
-Specif

[Libreoffice-commits] core.git: sd/uiconfig

[Caolán McNamara]

 sd/uiconfig/simpress/ui/prntopts.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6d2369bc27160839db96cd040d0b4a8dcbb87b2
Author: Caolán McNamara 
Date:   Mon Jun 10 14:49:03 2013 +0100

typos: GrayScale->Grayscale

Change-Id: I892fd1a4b8085c1f7c9651d15015fc220876ebee

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index d63ab25..59307e0 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -447,7 +447,7 @@
 
 
   
-Gra_yScale
+Gra_yscale
 True
 True
 False
___
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

[Caolán McNamara]

 helpers/help_hid.lst |   14 ---
 source/text/shared/optionen/01040900.xhp |6 ++--
 source/text/shared/optionen/01060300.xhp |   39 +++
 3 files changed, 23 insertions(+), 36 deletions(-)

New commits:
commit 62d083404f888fa33ad1264c59b46ae8a6278e91
Author: Caolán McNamara 
Date:   Mon Jun 10 14:41:16 2013 +0100

update help ids for calc general options .ui conversion

Change-Id: I0f8eb7b3f10725db46e5c40c10bdebd31ebd1bd4

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f00e425..f9f3698 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3214,7 +3214,6 @@ HID_SCH_WIN_DOCUMENT,63289,
 HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
 HID_SCPAGE_CONTENT,58892,
-HID_SCPAGE_LAYOUT,58893,
 HID_SCPAGE_SUBT_GROUP,58876,
 HID_SCPAGE_SUBT_GROUP1,58885,
 HID_SCPAGE_SUBT_GROUP2,58886,
@@ -6462,13 +6461,6 @@ sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM,958186531,
 sc_CheckBox_RID_SCPAGE_CONTENT_CB_TBLREG,958186550,
 sc_CheckBox_RID_SCPAGE_CONTENT_CB_VALUE,958186520,
 sc_CheckBox_RID_SCPAGE_CONTENT_CB_VSCROLL,958186549,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_ALIGN,958202951,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_EDITMODE,958202953,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_EXPREF,958202956,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_FORMAT,958202954,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_MARKHDR,958202957,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_REPLWARN,958202959,
-sc_CheckBox_RID_SCPAGE_LAYOUT_CB_TEXTFMT,958202958,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_CASE,956810262,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_FORMATS,956810273,
 sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_PAGEBREAK,956810261,
@@ -6627,8 +6619,6 @@ sc_ListBox_RID_SCPAGE_CONTENT_LB_COLOR,958189115,
 sc_ListBox_RID_SCPAGE_CONTENT_LB_DIAGRAM,958189086,
 sc_ListBox_RID_SCPAGE_CONTENT_LB_DRAW,958189088,
 sc_ListBox_RID_SCPAGE_CONTENT_LB_OBJGRF,958189084,
-sc_ListBox_RID_SCPAGE_LAYOUT_LB_ALIGN,958205512,
-sc_ListBox_RID_SCPAGE_LAYOUT_LB_UNIT,958205502,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
@@ -6641,7 +6631,6 @@ sc_MetricField_RID_SCDLG_COL_MAN_ED_VALUE,1494915585,
 sc_MetricField_RID_SCDLG_COL_OPT_ED_VALUE,1494931969,
 sc_MetricField_RID_SCDLG_ROW_MAN_ED_VALUE,1494948353,
 sc_MetricField_RID_SCDLG_ROW_OPT_ED_VALUE,1494964737,
-sc_MetricField_RID_SCPAGE_LAYOUT_MF_TAB,958208577,
 sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712,
 sc_ModalDialog_RID_SCDLG_COLORROW,1494368256,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
@@ -6744,9 +6733,6 @@ 
sc_RadioButton_RID_SCDLG_RETYPEPASS_INPUT_BTN_RETYPE_PASSWORD,1495679794,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
-sc_RadioButton_RID_SCPAGE_LAYOUT_RB_ALWAYS,958202370,
-sc_RadioButton_RID_SCPAGE_LAYOUT_RB_NEVER,958202372,
-sc_RadioButton_RID_SCPAGE_LAYOUT_RB_REQUEST,958202371,
 sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_DOWN1,956432906,
 sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_DOWN2,956432907,
 sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_DOWN3,956432908,
diff --git a/source/text/shared/optionen/01040900.xhp 
b/source/text/shared/optionen/01040900.xhp
index b3f5863..e41c7b3 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -52,13 +52,13 @@
 
 Update
 Update links when loading
-
+
 Always
 Always 
updates links while loading a document.
-
+
 On request
 Updates 
links only on request while loading a document.
-
+
 Never
 Links are 
never updated while loading a document.
 
diff --git a/source/text/shared/optionen/01060300.xhp 
b/source/text/shared/optionen/01060300.xhp
index d08b35e..ed78771 100644
--- a/source/text/shared/optionen/01060300.xhp
+++ b/source/text/shared/optionen/01060300.xhp
@@ -40,6 +40,7 @@
 column headers; highlighting (Calc)
 row headers; highlighting (Calc)
 
+
 General
 Defines general settings for spreadsheet documents.
 
@@ -47,31 +48,31 @@
   
 
 Metrics
-Measurement unit
-Defines the unit 
of measure in spreadsheets.
-Tab stops
-Defines the 
tab stops distance.
+Measurement unit
+Defines the unit 
of measure in spreadsheets.
+Tab stops
+Defines the tab 
stops distance.
 
 Input settings
-
-Press Enter to move 
selection
-Determines the 
direction that the cursor in the spreadsheet will move after you press the 
Enter key.
-
+
+Press Enter to move 
selection
+Determines the 
direction that the cursor in the spreadsheet will move after you press the 
Enter key.
+
 see i53756Press Enter to 
switch to edit mode
-Allows you to 
immediately edit the selected cell after pressing the Enter 
key.
-Expand formatting
-Specifies 
whether to automatically apply the formatting attributes of the selected cell 
to the empty adjacent cells. If, for example, the contents of the 
selected cell have the bold attribute, this bold attribute will also appl

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 1b9278298ab571582e289f490e809177a9f50ac3
Author: Caolán McNamara 
Date:   Mon Jun 10 14:41:16 2013 +0100

Updated core
Project: help  62d083404f888fa33ad1264c59b46ae8a6278e91

diff --git a/helpcontent2 b/helpcontent2
index adbfa59..62d0834 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit adbfa5972aeaae80fbf94e11e523a91fe25e19bb
+Subproject commit 62d083404f888fa33ad1264c59b46ae8a6278e91
___
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' - cui/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/acorreplacepage.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d3c17f11c8ee3c78be81fa7b85617f92852a3aa5
Author: Caolán McNamara 
Date:   Mon Jun 10 14:26:46 2013 +0100

Resolves: fdo#65609 don't use whole text for optimal width

Change-Id: Ie0aed71457891e58916d064c9a59d5927c31f1f7
(cherry picked from commit 11c89fe5fb40adf3d205c666e7b5d202c1dd314b)

diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index 572057f..f300c86 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -66,6 +66,7 @@
 True
 True
 ●
+20
   
   
 0
@@ -80,6 +81,7 @@
 True
 True
 ●
+30
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/acorreplacepage.ui   |2 ++
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 11c89fe5fb40adf3d205c666e7b5d202c1dd314b
Author: Caolán McNamara 
Date:   Mon Jun 10 14:26:46 2013 +0100

Resolves: fdo#65609 don't use whole text for optimal width

Change-Id: Ie0aed71457891e58916d064c9a59d5927c31f1f7

diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index 572057f..f300c86 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -66,6 +66,7 @@
 True
 True
 ●
+20
   
   
 0
@@ -80,6 +81,7 @@
 True
 True
 ●
+30
   
   
 1
commit 1579745163cd1682bb3e27873b9654eb842adfac
Author: Armin Le Grand 
Date:   Mon Jun 10 10:45:46 2013 +

Resolves: #i122493# Removed Line/AreaPropertyPanel on Writer OLE context

(cherry picked from commit 7fb9e99fcc522731165f3ad20aae43d81bb7df65)

Change-Id: Ic4dd8c7c5d964fce9ed971c9a5a337a7cbb04fcc

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index cd69c01..26a2bc8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -323,7 +323,6 @@
 DrawImpress,TextObject, hidden  ;
 DrawImpress,OLE,hidden  ;
 WriterVariants, Draw,   visible ;
-WriterVariants, OLE,hidden, .uno:FrameDialog ;
   
 
 
@@ -358,7 +357,6 @@
 DrawImpress,TextObject, hidden  ;
 DrawImpress,OLE,hidden  ;
 WriterVariants, Draw,   visible ;
-WriterVariants, OLE,hidden, .uno:FrameDialog ;
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit e6a314bb800c6a0f00be12d621d7ff7146758b55
Author: Caolán McNamara 
Date:   Mon Jun 10 14:12:39 2013 +0100

Notes added by 'git notes add'

diff --git a/7f/b9e99fcc522731165f3ad20aae43d81bb7df65 
b/7f/b9e99fcc522731165f3ad20aae43d81bb7df65
new file mode 100644
index 000..9bdf447
--- /dev/null
+++ b/7f/b9e99fcc522731165f3ad20aae43d81bb7df65
@@ -0,0 +1 @@
+merged as: 1579745163cd1682bb3e27873b9654eb842adfac
___
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

[Armin Le Grand]

 svx/source/sidebar/area/AreaPropertyPanel.cxx |7 +++
 svx/source/sidebar/line/LinePropertyPanel.cxx |7 +++
 2 files changed, 14 insertions(+)

New commits:
commit 6de6c7a38728167dc2eed1a4b4f5deeccc3fef91
Author: Armin Le Grand 
Date:   Mon Jun 10 10:39:36 2013 +

Resolves: #i122493# Corrected Enable/Disable for some DropDowns/Texts...

in Line/AreaPropertyPanel

(cherry picked from commit 2890568e3ac8e140d12f05d8ac74f3be50ffa45d)

Change-Id: I6436b165a873e6f79af29690170231af939f
(cherry picked from commit d1a0b4f01b9c3a54dfcbee65e13d6dd4d1a78dfe)

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx 
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 6340978..df87602 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -656,6 +656,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 else if(nValue <= 100)
 {
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpLBTransType->SelectEntryPos(1);
 mpBTNGradient->Hide();
 mpMTRTransparent->Show();
@@ -678,6 +679,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 Image* pImage = 0;
 
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpMTRTransparent->Hide();
 mpBTNGradient->Enable();
 mpBTNGradient->Show();
@@ -735,6 +737,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 if(bZeroValue)
 {
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpLBTransType->SelectEntryPos(0);
 mpBTNGradient->Hide();
 mpMTRTransparent->Enable();
@@ -746,6 +749,8 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 {
 // no transparency at all
 mpLBTransType->SetNoSelection();
+mpLBTransType->Disable();
+mpTrspTextFT->Disable();
 mpMTRTransparent->Disable();
 mpMTRTransparent->Show();
 mpBTNGradient->Disable();
@@ -828,6 +833,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLbFillType->Disable();
+mpColorTextFT->Disable();
 mpLbFillType->SetNoSelection();
 mpLbFillAttr->Show();
 mpLbFillAttr->Disable();
@@ -845,6 +851,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
 {
 mpStyleItem.reset(dynamic_cast< XFillStyleItem* 
>(pItem->Clone()));
 mpLbFillType->Enable();
+mpColorTextFT->Enable();
 XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue();
 meLastXFS = eXFS;
 mpLbFillType->SelectEntryPos(sal::static_int_cast< 
sal_uInt16 >(eXFS));
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx 
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 915d48b..1302205 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -577,10 +577,12 @@ void LinePropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLBEdgeStyle->Disable();
+mpFTEdgeStyle->Disable();
 }
 else
 {
 mpLBEdgeStyle->Enable();
+mpFTEdgeStyle->Enable();
 }
 
 if(eState >= SFX_ITEM_DEFAULT)
@@ -635,10 +637,12 @@ void LinePropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLBCapStyle->Disable();
+mpFTCapStyle->Disable();
 }
 else
 {
 mpLBCapStyle->Enable();
+mpLBCapStyle->Enable();
 }
 
 if(eState >= SFX_ITEM_DEFAULT)
@@ -1052,6 +1056,7 @@ void LinePropertyPanel::SelectLineStyle()
 if( !mpStyleItem.get() || !mpDashItem.get() )
 {
 mpLBStyle->SetNoSelection();
+mpLBStyle->Disable();
 return;
 }
 
@@ -1097,6 +1102,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
 if( !mpStartItem.get() )
 {
 mpLBStart->SetNoSelection();
+mpLBStart->Disable();
 return;
 }
 
@@ -1125,6 +1131,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
 if( !mpEndItem.get() )
 {
 mpLBEnd->SetNoSelection();
+mpLBEnd->Disable();
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svx/source/sidebar/area/AreaPropertyPanel.cxx |7 +++
 svx/source/sidebar/line/LinePropertyPanel.cxx |7 +++
 2 files changed, 14 insertions(+)

New commits:
commit d1a0b4f01b9c3a54dfcbee65e13d6dd4d1a78dfe
Author: Armin Le Grand 
Date:   Mon Jun 10 10:39:36 2013 +

Resolves: #i122493# Corrected Enable/Disable for some DropDowns/Texts...

in Line/AreaPropertyPanel

(cherry picked from commit 2890568e3ac8e140d12f05d8ac74f3be50ffa45d)

Change-Id: I6436b165a873e6f79af29690170231af939f

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx 
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 6340978..df87602 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -656,6 +656,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 else if(nValue <= 100)
 {
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpLBTransType->SelectEntryPos(1);
 mpBTNGradient->Hide();
 mpMTRTransparent->Show();
@@ -678,6 +679,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 Image* pImage = 0;
 
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpMTRTransparent->Hide();
 mpBTNGradient->Enable();
 mpBTNGradient->Show();
@@ -735,6 +737,7 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 if(bZeroValue)
 {
 mpLBTransType->Enable();
+mpTrspTextFT->Enable();
 mpLBTransType->SelectEntryPos(0);
 mpBTNGradient->Hide();
 mpMTRTransparent->Enable();
@@ -746,6 +749,8 @@ void AreaPropertyPanel::ImpUpdateTransparencies()
 {
 // no transparency at all
 mpLBTransType->SetNoSelection();
+mpLBTransType->Disable();
+mpTrspTextFT->Disable();
 mpMTRTransparent->Disable();
 mpMTRTransparent->Show();
 mpBTNGradient->Disable();
@@ -828,6 +833,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLbFillType->Disable();
+mpColorTextFT->Disable();
 mpLbFillType->SetNoSelection();
 mpLbFillAttr->Show();
 mpLbFillAttr->Disable();
@@ -845,6 +851,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
 {
 mpStyleItem.reset(dynamic_cast< XFillStyleItem* 
>(pItem->Clone()));
 mpLbFillType->Enable();
+mpColorTextFT->Enable();
 XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue();
 meLastXFS = eXFS;
 mpLbFillType->SelectEntryPos(sal::static_int_cast< 
sal_uInt16 >(eXFS));
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx 
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 915d48b..1302205 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -577,10 +577,12 @@ void LinePropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLBEdgeStyle->Disable();
+mpFTEdgeStyle->Disable();
 }
 else
 {
 mpLBEdgeStyle->Enable();
+mpFTEdgeStyle->Enable();
 }
 
 if(eState >= SFX_ITEM_DEFAULT)
@@ -635,10 +637,12 @@ void LinePropertyPanel::NotifyItemUpdate(
 if(bDisabled)
 {
 mpLBCapStyle->Disable();
+mpFTCapStyle->Disable();
 }
 else
 {
 mpLBCapStyle->Enable();
+mpLBCapStyle->Enable();
 }
 
 if(eState >= SFX_ITEM_DEFAULT)
@@ -1052,6 +1056,7 @@ void LinePropertyPanel::SelectLineStyle()
 if( !mpStyleItem.get() || !mpDashItem.get() )
 {
 mpLBStyle->SetNoSelection();
+mpLBStyle->Disable();
 return;
 }
 
@@ -1097,6 +1102,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
 if( !mpStartItem.get() )
 {
 mpLBStart->SetNoSelection();
+mpLBStart->Disable();
 return;
 }
 
@@ -1125,6 +1131,7 @@ void LinePropertyPanel::SelectEndStyle(bool bStart)
 if( !mpEndItem.get() )
 {
 mpLBEnd->SetNoSelection();
+mpLBEnd->Disable();
 return;
 }
 
___
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' - 28/90568e3ac8e140d12f05d8ac74f3be50ffa45d

[Caolán McNamara]

 28/90568e3ac8e140d12f05d8ac74f3be50ffa45d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0266edff2c629f161e1035f179ca956cf29227d6
Author: Caolán McNamara 
Date:   Mon Jun 10 14:10:53 2013 +0100

Notes added by 'git notes add'

diff --git a/28/90568e3ac8e140d12f05d8ac74f3be50ffa45d 
b/28/90568e3ac8e140d12f05d8ac74f3be50ffa45d
new file mode 100644
index 000..80fc099
--- /dev/null
+++ b/28/90568e3ac8e140d12f05d8ac74f3be50ffa45d
@@ -0,0 +1 @@
+merged as: d1a0b4f01b9c3a54dfcbee65e13d6dd4d1a78dfe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/layout/trvlfrm.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 721baad94ee81d9d6281edb93ee45936f6e0e496
Author: Miklos Vajna 
Date:   Mon Jun 10 14:48:59 2013 +0200

bnc#802888 SwPageFrm: one more clickable field fix

This is similar to a996678ed30804e16103e1cfdc439c8546e5d3b0. If we have
both a background object and some clickable field to select, we should
always prefer the clickable field.

This time, the problem was to click on a clickable field, when the
cursor was in normal text and we had a full-page background object.

Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd

diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 0d9fd9c..1a2bb5c 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -258,13 +258,28 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 }
 }
 
+SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
+bool bConsiderBackground = true;
+// If the text position is a clickable field, then that should have 
priority.
+if (pTextNd && pTextNd->IsTxtNode())
+{
+SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
+SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+if (pTxtAttr)
+{
+const SwField* pField = pTxtAttr->GetFld().GetFld();
+if (pField->IsClickable())
+bConsiderBackground = false;
+}
+}
+
 // Check objects in the background if nothing else matched
 if ( GetSortedObjs() )
 {
 bBackRet = lcl_GetCrsrOfst_Objects( this, true, &aBackPos, rPoint, 
pCMS );
 }
 
-if ( ( bTestBackground && bBackRet ) || !bTextRet )
+if ( ( bConsiderBackground && bTestBackground && bBackRet ) || 
!bTextRet )
 {
 bRet = bBackRet;
 (*pPos) = aBackPos;
@@ -280,10 +295,8 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
  * text and brackground object, then we compute the distance 
between both
  * would-be positions and the click point. The shortest distance 
wins.
  */
-SwCntntNode* pTextNd = aTextPos.nNode.GetNode( ).GetCntntNode( );
 double nTextDistance = 0;
 bool bValidTextDistance = false;
-bool bConsiderBackground = true;
 if ( pTextNd )
 {
 SwCntntFrm* pTextFrm = pTextNd->getLayoutFrm( getRootFrm( ) );
@@ -292,19 +305,6 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
&rPoint,
 
 nTextDistance = lcl_getDistance( rTextRect, rPoint );
 bValidTextDistance = true;
-
-// If the text position is a clickable field, then that should 
have priority.
-if (pTextNd->IsTxtNode())
-{
-SwTxtNode* pTxtNd = pTextNd->GetTxtNode();
-SwTxtAttr* pTxtAttr = 
pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
-if (pTxtAttr)
-{
-const SwField* pField = pTxtAttr->GetFld().GetFld();
-if (pField->IsClickable())
-bConsiderBackground = false;
-}
-}
 }
 
 double nBackDistance = 0;
___
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

[Caolán McNamara]

 svx/source/sidebar/PanelLayout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 78beb05263129a1acd0fde6c03d828d813fd4a94
Author: Caolán McNamara 
Date:   Mon Jun 10 14:05:28 2013 +0100

Resolves: fdo#65546 set Panel Layouts as DialogControl widgets

Change-Id: Iaf0e1dccf1af3bcec1057e42934d2931ccebfd32
(cherry picked from commit a4c07d983ab5562c914dad0d06cb24c61a7f3b41)

diff --git a/svx/source/sidebar/PanelLayout.cxx 
b/svx/source/sidebar/PanelLayout.cxx
index 568f151..2c5a5bb 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -13,6 +13,7 @@
 PanelLayout::PanelLayout(Window* pParent, const OString& rID, const OUString& 
rUIXMLDescription, const 
com::sun::star::uno::Reference &rFrame)
 : Control(pParent)
 {
+SetStyle(GetStyle() | WB_DIALOGCONTROL);
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, 
rID, rFrame);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sidebar/PanelLayout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4c07d983ab5562c914dad0d06cb24c61a7f3b41
Author: Caolán McNamara 
Date:   Mon Jun 10 14:05:28 2013 +0100

Resolves: fdo#65546 set Panel Layouts as DialogControl widgets

Change-Id: Iaf0e1dccf1af3bcec1057e42934d2931ccebfd32

diff --git a/svx/source/sidebar/PanelLayout.cxx 
b/svx/source/sidebar/PanelLayout.cxx
index 568f151..2c5a5bb 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -13,6 +13,7 @@
 PanelLayout::PanelLayout(Window* pParent, const OString& rID, const OUString& 
rUIXMLDescription, const 
com::sun::star::uno::Reference &rFrame)
 : Control(pParent)
 {
+SetStyle(GetStyle() | WB_DIALOGCONTROL);
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, 
rID, rFrame);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools

[Fridrich Štrba]

 include/tools/bigint.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 820901f91513ec4db2911a06f28b9d15417088fe
Author: Fridrich Å trba 
Date:   Mon Jun 10 14:27:58 2013 +0200

WaE: comparison between signed and unsigned integer expressions

Change-Id: I3b5e3a8bf4bbecf6bf697b91c9a16ec19045bfdf

diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index d3a2c2f..0cf47ad 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -182,7 +182,7 @@ inline BigInt::operator int() const
 
 inline BigInt::operator sal_uInt16() const
 {
-if ( !bIsBig && nVal >= 0 && nVal <= USHRT_MAX )
+if ( !bIsBig && nVal >= 0 && nVal <= (long)USHRT_MAX )
 return (sal_uInt16)nVal;
 else
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bugzilla] Verifiy a fix?

[Ahmad Hussein Al-Harthi]

Hello everyone,

I want to be able to verify LO fixes on bugs.freedesktop.org, whom should I ask?





Ahmad Harthi,
KACST
Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على 
معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك 
تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك 
نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح 
بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان 
وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم 
والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار 
الناتجة عن ما قد يحتويه هذا البريد.

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

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

[Oliver-Rainer Wittmann]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx|7 +
 svx/source/sidebar/line/LinePropertyPanel.cxx|7 +
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx  |   12 --
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx   |   62 ++-
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx   |   11 -
 6 files changed, 57 insertions(+), 44 deletions(-)

New commits:
commit 22e334845346f4e3189c72e706d744385953af19
Author: Oliver-Rainer Wittmann 
Date:   Mon Jun 10 11:11:00 2013 +

Correct the XML document handler which is used to parse Microsoft Word 
OOXML documents in case of unknown XML elements

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 811817b..fc743f8 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -68,10 +68,8 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & 
rStreamHandler,
 {
 uno::Reference 
xContext(mpStream->getContext());
 OOXMLFastDocumentHandler * pDocHandler =
-new OOXMLFastDocumentHandler(xContext);
-pDocHandler->setStream(&rStreamHandler);
-pDocHandler->setDocument(this);
-pDocHandler->setXNoteId(msXNoteId);
+new OOXMLFastDocumentHandler(
+xContext, &rStreamHandler, this, msXNoteId );
 
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
@@ -317,10 +315,8 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 uno::Reference 
xContext(mpStream->getContext());
 
 OOXMLFastDocumentHandler * pDocHandler =
-new OOXMLFastDocumentHandler(xContext);
-pDocHandler->setStream(&rStream);
-pDocHandler->setDocument(this);
-pDocHandler->setXNoteId(msXNoteId);
+new OOXMLFastDocumentHandler(
+xContext, &rStream, this, msXNoteId );
 pDocHandler->setIsSubstream( mbIsSubstream );
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index a13ac78..792b611 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -39,10 +39,28 @@ using namespace ::com::sun::star;
 using namespace ::std;
 
 
-OOXMLFastDocumentHandler::OOXMLFastDocumentHandler
-(uno::Reference< uno::XComponentContext > const & context)
-: m_xContext(context)
-{}
+OOXMLFastDocumentHandler::OOXMLFastDocumentHandler(
+uno::Reference< uno::XComponentContext > const & context,
+Stream* pStream,
+OOXMLDocument* pDocument,
+const ::rtl::OUString& rXNoteId )
+: m_xContext(context)
+, mpStream( pStream )
+#ifdef DEBUG_ELEMENT
+, mpTmpStream()
+#endif
+, mpDocument( pDocument )
+, msXNoteId( rXNoteId )
+, mpContextHandler()
+{
+#ifdef DEBUG_PROTOCOL
+if ( pStream )
+{
+mpTmpStream.reset( new StreamProtocol( pStream, debug_logger ) );
+mpStream = mpTmpStream.get();
+}
+#endif
+}
 
 // ::com::sun::star::xml::sax::XFastContextHandler:
 void SAL_CALL OOXMLFastDocumentHandler::startFastElement
@@ -145,6 +163,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
  << endl;
 #endif
 
+if ( mpStream == 0 && mpDocument == 0 )
+{
+// document handler has been created as unknown child - see 

+// --> do not provide a child context
+return NULL;
+}
+
 return 
OOXMLFactory::getInstance()->createFastChildContextFromStart(getContextHandler().get(),
 Element);
 }
 
@@ -171,13 +196,12 @@ Name
 #endif
 
 return uno::Reference< xml::sax::XFastContextHandler >
-(new OOXMLFastDocumentHandler(m_xContext));
+( new OOXMLFastDocumentHandler( m_xContext, 0, 0, ::rtl::OUString() ) 
);
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::characters(const ::rtl::OUString & 
/*aChars*/)
 throw (uno::RuntimeException, xml::sax::SAXException)
 {
-// TODO: Insert your implementation for "characters" here.
 }
 
 // ::com::sun::star::xml::sax::XFastDocumentHandler:
@@ -195,32 +219,14 @@ void SAL_CALL OOXMLFastDocumentHandler::setDocumentLocator
 (const uno::Reference< xml::sax::XLocator > & /*xLocator*/)
 throw (uno::RuntimeException, xml::sax::SAXException)
 {
-// TODO: Insert your implementation for "setDocumentLocator" here.
-}
-
-void OOXMLFastDocumentHandler::setStream(Stream * pStream)
-{
-#ifdef DEBUG_PROTOCOL
-mpTmpStream.reset(new StreamProtocol(pStream, debug_logger));
-mpStream = mpTmpStream.get();
-#else
-mpStream = pStream;
-#endif
-}
-
-void OOXMLFastDocumentHandler::setDocument(OOXMLDocument * pDocument)
-{
-mpDocument = pDocument;
-}
-
-void OOXMLFastDoc

[Libreoffice-commits] core.git: 27 commits - basic/source bean/native dbaccess/source dbaccess/win32 desktop/source dtrans/source editeng/source extensions/source fpicker/source framework/source inclu

[Fridrich Štrba]

 basic/source/runtime/dllmgr-x64.cxx   |3 +
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |2 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx   |2 
 dbaccess/source/ui/querydesign/querydlg.cxx   |8 +--
 dbaccess/win32/source/odbcconfig/odbcconfig.cxx   |2 
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx|2 
 desktop/source/deployment/misc/dp_misc.cxx|1 
 dtrans/source/win32/misc/ImplHelper.cxx   |2 
 editeng/source/editeng/editview.cxx   |2 
 extensions/source/nsplugin/source/nsp_windows.cxx |   23 +++---
 extensions/source/nsplugin/source/nsp_windows.hxx |   19 ++--
 extensions/source/nsplugin/source/so_main.cxx |4 -
 extensions/source/plugin/win/sysplug.cxx  |4 -
 extensions/source/scanner/scanwin.cxx |   16 +++---
 fpicker/source/generic/fpicker.cxx|2 
 fpicker/source/win32/filepicker/PreviewCtrl.cxx   |2 
 fpicker/source/win32/filepicker/dibpreview.cxx|8 ---
 fpicker/source/win32/filepicker/helppopupwindow.cxx   |2 
 fpicker/source/win32/folderpicker/MtaFop.cxx  |2 
 framework/source/uielement/fontsizemenucontroller.cxx |4 -
 include/sal/types.h   |   18 ---
 include/svl/svdde.hxx |   10 ++--
 include/svtools/ctrltool.hxx  |8 +--
 include/systools/win32/uwinapi.h  |2 
 include/tools/link.hxx|4 -
 include/tools/resary.hxx  |8 +--
 pyuno/zipcore/python.cxx  |4 -
 sal/osl/w32/dllentry.c|8 +--
 sal/osl/w32/thread.c  |8 +--
 sal/rtl/alloc_arena.cxx   |2 
 sal/rtl/alloc_global.cxx  |2 
 sc/source/filter/xml/XMLStylesExportHelper.cxx|4 -
 sd/source/ui/remotecontrol/BluetoothServer.cxx|4 -
 sfx2/source/dialog/mgetempl.cxx   |2 
 store/source/storbase.cxx |2 
 svl/source/svdde/ddeimp.hxx   |2 
 svl/source/svdde/ddesvr.cxx   |8 +--
 svtools/source/control/ctrlbox.cxx|4 -
 svtools/source/control/ctrltool.cxx   |8 +--
 svtools/source/control/stdmenu.cxx|4 -
 svx/source/gengal/gengal.cxx  |6 ++
 sw/source/core/docnode/nodedump.cxx   |   14 +++---
 sw/source/core/text/xmldump.cxx   |6 ++
 tools/source/rc/resary.cxx|2 
 ucb/source/ucp/webdav-neon/DAVSession.hxx |2 
 vcl/source/gdi/impvect.cxx|2 
 vcl/win/source/app/salinst.cxx|6 +-
 vcl/win/source/gdi/salgdi3.cxx|2 
 vcl/win/source/window/salframe.cxx|6 +-
 49 files changed, 140 insertions(+), 128 deletions(-)

New commits:
commit 4e41227dd6af52ec562d10efcb365defba6bd36e
Author: Fridrich Å trba 
Date:   Mon Jun 10 13:19:14 2013 +0200

mingw64: change Link class to use sal_IntPtr instead of long

Change-Id: I2b78c7b714ff064f2f1b8a8eb161e5e2ae121eee

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index d7616d1..e5f45e7 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1348,7 +1348,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& 
rSet, const FontList* pFo
 nHeight = OutputDevice::LogicToLogic( nHeight * 10, (MapUnit)eUnit, 
MAP_POINT );
 
 FontInfo aFontInfo = pFontList->Get( pFontItem->GetFamilyName(), 
pFontItem->GetStyleName() );
-const long* pAry = pFontList->GetSizeAry( aFontInfo );
+const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontInfo );
 
 if( bGrow )
 {
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 66ec9f0..0a1d22b 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -96,8 +96,8 @@ protected:
 DdeData aDdeData;
 DdeString*  pName;
 short   nType;
-longnId;
-longnTime;
+sal_IntPtr  nId;
+sal_IntPtr  nTime;
 LinkaData;
 LinkaDone;
 boolbBusy;
@@ 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-4' - translations

[Andras Timar]

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

New commits:
commit f8ec969ee5c69f46ad9667f4c708d1852b53edde
Author: Andras Timar 
Date:   Mon Jun 10 13:57:04 2013 +0200

Updated core
Project: translations  f274c16fc9b7d59bfc3c527afbb08c319dec1a58

diff --git a/translations b/translations
index 2767b50..f274c16 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2767b504a74ebee6de078e54b7c020aea4047672
+Subproject commit f274c16fc9b7d59bfc3c527afbb08c319dec1a58
___
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' - translations

[Andras Timar]

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

New commits:
commit 83ac9ddda64dd3e7a97043d9319e69af4b96f164
Author: Andras Timar 
Date:   Mon Jun 10 13:57:04 2013 +0200

Updated core
Project: translations  9b5110fd0c47fb475a83ae33b286bdcff2652784

diff --git a/translations b/translations
index 13c3505..9b5110f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 13c35052f95c82d80f0751d80c4b9c03f488b5de
+Subproject commit 9b5110fd0c47fb475a83ae33b286bdcff2652784
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/uiconfig

[Caolán McNamara]

 sd/uiconfig/simpress/ui/prntopts.ui |  309 +---
 1 file changed, 154 insertions(+), 155 deletions(-)

New commits:
commit f8df80b489971021c49e85d66f110304bec4dd88
Author: Caolán McNamara 
Date:   Mon Jun 10 12:53:17 2013 +0100

lets put the row that has the optional column at the bottom

Rather than have an incomplete first row and a complete second row, have the
opposite. Looks more balanced. Two clicks required post .ui conversion two 
days
required pre .ui conversion :-)

Change-Id: I595a17f84dc0988b261d67bccdaa4582f2db6c2a

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index ca323d5..d63ab25 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -8,34 +8,36 @@
 vertical
 12
 
-  
+  
 True
 False
 12
 True
 
-  
+  
 True
 False
 0
 none
 
-  
+  
 True
 False
 6
 12
 
-  
+  
 True
 False
 6
+12
 
-  
-Drawing
+  
+_Page 
name
 True
 False
 False
+True
 0
 True
   
@@ -47,11 +49,12 @@
   
 
 
-  
-Notes
+  
+D_ate
 True
 False
 False
+True
 0
 True
   
@@ -63,11 +66,12 @@
   
 
 
-  
-Handouts
+  
+Ti_me
 True
 False
 False
+True
 0
 True
   
@@ -79,11 +83,12 @@
   
 
 
-  
-Outline
+  
+H_idden 
pages
 True
 False
 False
+True
 0
 True
   
@@ -99,10 +104,10 @@
   
 
 
-  
+  
 True
 False
-Content
+Print
 
   
 
@@ -116,24 +121,25 @@
   
 
 
-  
+  
 True
 False
 0
 none
 
-  
+  
 True
 False
 6
 12
 
-  
+  
 True
 False
 6
+12
 
-  
+  
 Default
 True
 False
@@ -141,7 +147,7 @@
 0
 True
 True
-grayscalerb
+fittopgrb
   
   
 0
@@ -151,15 +157,15 @@
   
 
 
-  
-Gra_yScale
+  
+_Fit to 
page
 True
 False
 False
 True
-0.009997764825821
+0
 True
-blackwhiterb
+tilepgrb
   
   
 0
@@ -169,15 +175,15 @@
   
 
 
-  
-Black & 
_white
+  
+_Tile 
pages
 True
 False
 False
 True
 0
 True
-defaultrb
+  

[Libreoffice-commits] core.git: sd/uiconfig

[Caolán McNamara]

 sd/uiconfig/simpress/ui/prntopts.ui |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 7f9c58d66b9640ab8b54e582cbb25d2e3a57970d
Author: Caolán McNamara 
Date:   Mon Jun 10 12:40:00 2013 +0100

Brouchure->Brochure

Change-Id: Icc3567c0392a5fbee422162abceda6346d6a5fe6

diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index 6f348ac..ca323d5 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -4,13 +4,14 @@
   
 True
 False
+6
 vertical
-6
+12
 
   
 True
 False
-6
+12
 True
 
   
@@ -218,7 +219,7 @@
   
 True
 False
-6
+12
 True
 
   
@@ -371,7 +372,6 @@
 False
 True
 0
-True
 True
 tilepgrb
   
@@ -390,7 +390,6 @@
 False
 True
 0
-True
 True
 brouchrb
   
@@ -403,13 +402,12 @@
 
 
   
-B_rouchure
+B_rochure
 True
 False
 False
 True
 0
-True
 True
 pagedefaultrb
   
@@ -441,8 +439,8 @@
   
 True
 False
-50
-6
+24
+12
 
   
 Fr_ont
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fb07d6b375bc2a23eec7bb2fe93359d96fa0377f
Author: Tor Lillqvist 
Date:   Mon Jun 10 14:15:03 2013 +0300

WaE: unknown log area 'starmarh' [loplugin]

Change-Id: Ia996a8fe2f791fd6cc8e08e7bf860e3a584a7d61

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 70b7d17..22f618c 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -172,6 +172,7 @@ certain functionality.
 
 @section Math
 
+@li @c starmath
 @li @c starmath.rtf
 @li @c starmath.ooxml - OOXML import/export
 @li @c starmath.wordbase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk

[Abdulaziz A Alayed]

 sd/AllLangResTarget_sd.mk   |1 
 sd/UIConfig_simpress.mk |1 
 sd/inc/helpids.h|1 
 sd/source/ui/app/sdmod2.cxx |1 
 sd/source/ui/dlg/prntopts.cxx   |  252 +++--
 sd/source/ui/dlg/prntopts.src   |  214 --
 sd/source/ui/inc/prntopts.hrc   |   47 ---
 sd/source/ui/inc/prntopts.hxx   |   47 +--
 sd/uiconfig/simpress/ui/prntopts.ui |  517 
 9 files changed, 645 insertions(+), 436 deletions(-)

New commits:
commit df8875509b823c3ab1626df8946e6d9295bfd8dd
Author: Abdulaziz A Alayed 
Date:   Mon Jun 10 13:15:20 2013 +0200

convert impress and draw print page to .ui format

Change-Id: I4f72ca2f1d090fede24c7d7441f1855c617ab315

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 5466ad3..6b7b144 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/PaneDockingWindow.src \
 sd/source/ui/dlg/paragr.src \
 sd/source/ui/dlg/prltempl.src \
-sd/source/ui/dlg/prntopts.src \
 sd/source/ui/dlg/RemoteDialog.src \
 sd/source/ui/dlg/sdpreslt.src \
 sd/source/ui/dlg/tabtempl.src \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index db9f2c5..16d0cae 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/photoalbum \
sd/uiconfig/simpress/ui/customslideshows \
sd/uiconfig/simpress/ui/optimpressgeneralpage \
+   sd/uiconfig/simpress/ui/prntopts \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 8fb2364..bbace93 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -23,7 +23,6 @@
 #define HID_SDDRAWVIEWSHELL 
"SD_HID_SDDRAWVIEWSHELL"
 #define HID_SDGRAPHICVIEWSHELL  
"SD_HID_SDGRAPHICVIEWSHELL"
 #define HID_SDOUTLINEVIEWSHELL  
"SD_HID_SDOUTLINEVIEWSHELL"
-#define HID_SD_PRINT_OPTIONS
"SD_HID_SD_PRINT_OPTIONS"
 #define HID_SD_OPTIONS_SNAP 
"SD_HID_SD_OPTIONS_SNAP"
 #define HID_SD_AUTOPILOT_PAGE1  
"SD_HID_SD_AUTOPILOT_PAGE1"
 #define HID_SD_AUTOPILOT_PAGE2  
"SD_HID_SD_AUTOPILOT_PAGE2"
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index ed8e7c2..e07fd6e 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -66,7 +66,6 @@
 #include "sdpage.hxx"
 #include "sdxfer.hxx"
 #include "sdabstdlg.hxx"
-#include "prntopts.hrc"
 #include 
 
 /** retrieves the page that is currently painted. This will only be the master 
page
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index d70a42e..c67e429 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -19,7 +19,6 @@
 
 #include "sdattr.hxx"
 #include "optsitem.hxx"
-#include "prntopts.hrc"
 #include "sdresid.hxx"
 #include "prntopts.hxx"
 #include "app.hrc"
@@ -30,59 +29,47 @@
  *  dialog to adjust print options
  */
 SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
-SfxTabPage  ( pParent, SdResId( TP_PRINT_OPTIONS ), rInAttrs ),
-
-aGrpPrint   ( this, SdResId( GRP_PRINT ) ),
-aCbxDraw( this, SdResId( CBX_DRAW ) ),
-aCbxNotes   ( this, SdResId( CBX_NOTES ) ),
-aCbxHandout ( this, SdResId( CBX_HANDOUTS ) ),
-aCbxOutline ( this, SdResId( CBX_OUTLINE ) ),
-
-aSeparator1FL( this, SdResId( FL_SEPARATOR1 ) ),
-aGrpOutput  ( this, SdResId( GRP_OUTPUT ) ),
-aRbtColor   ( this, SdResId( RBT_COLOR ) ),
-aRbtGrayscale   ( this, SdResId( RBT_GRAYSCALE ) ),
-aRbtBlackWhite  ( this, SdResId( RBT_BLACKWHITE ) ),
-
-aGrpPrintExt( this, SdResId( GRP_PRINT_EXT ) ),
-aCbxPagename( this, SdResId( CBX_PAGENAME ) ),
-aCbxDate( this, SdResId( CBX_DATE ) ),
-aCbxTime( this, SdResId( CBX_TIME ) ),
-aCbxHiddenPages ( this, SdResId( CBX_HIDDEN_PAGES ) ),
-
-aSeparator2FL( this, SdResId( FL_SEPARATOR2 ) ),
-aGrpPageoptions ( this, SdResId( GRP_PAGE ) ),
-aRbtDefault ( this, SdResId( RBT_DEFAULT ) ),
-aRbtPagesize( this, SdResId( RBT_PAGESIZE ) ),
-aRbtPagetile( this, SdResId( RBT_PAGETILE ) ),
-aRbtBooklet ( this, SdResId( RBT_BOOKLET ) ),
-aCbxFront   ( this, SdResId( CBX_FRONT ) ),
-aCbxBack( this, SdResI

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

[Caolán McNamara]

 sc/uiconfig/scalc/ui/scgeneralpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8803299f2251e8f1c01e59edf389b972766f66d7
Author: Caolán McNamara 
Date:   Mon Jun 10 12:26:00 2013 +0100

I wanted to use cm instead of mm

Change-Id: I95e7ac1eeeae7e770196523bf6d75601452dcea0

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 4f119f0..699d320 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -62,7 +62,7 @@
 0
 _Tab 
stops
 True
-tabmf:0.00mm
+tabmf:0.00cm
   
   
 0
@@ -72,7 +72,7 @@
   
 
 
-  
+  
 True
 True
 •
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 40539, which changed state.

Bug 40539 Summary: FILESAVE as .doc (MSO2003) without  TABLE text rotation
https://bugs.freedesktop.org/show_bug.cgi?id=40539

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
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-4.0.3' - cppcanvas/source

[Michael Meeks]

 cppcanvas/source/mtfrenderer/emfplus.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 162fad1f3ccdb65aa682bb57508dd818721766c5
Author: Michael Meeks 
Date:   Mon Jun 10 12:10:50 2013 +0100

fix emfplus windows build.

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 30fa12e..2ac9207 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1294,12 +1294,12 @@ namespace cppcanvas
 B2DSize mappedSize( MapSize (dw/2, dh/2));
 
 float endAngle = startAngle + sweepAngle;
-startAngle = fmod (startAngle, M_PI*2);
+startAngle = fmodf (startAngle, M_PI*2);
 if (startAngle < 0)
-startAngle += M_PI*2;
-endAngle = fmod (endAngle, M_PI*2);
+startAngle += static_cast(M_PI*2);
+endAngle = fmodf (endAngle, M_PI*2);
 if (endAngle < 0)
-endAngle += M_PI*2;
+endAngle += static_cast(M_PI*2);
 if (sweepAngle < 0)
 std::swap (endAngle, startAngle);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/sal/log-areas.dox |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 32a8d3d46951ae765a2e700b21f234426e0c08d6
Author: Tor Lillqvist 
Date:   Mon Jun 10 13:42:03 2013 +0300

WaE: unknown log area 'package' [loplugin]

Change-Id: Ia05b608360a64f047ebfae8b179890c0d221e953

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 35bd016..70b7d17 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -178,6 +178,7 @@ certain functionality.
 
 @section package
 
+@li @c package
 @li @c package.xstor
 
 @section sdext
___
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' - cppcanvas/source

[Michael Meeks]

 cppcanvas/source/mtfrenderer/emfplus.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c07f2af71c2bb1dc06cf1a1d46aa1ff424c1acb7
Author: Michael Meeks 
Date:   Mon Jun 10 12:01:31 2013 +0100

Fix windows compile of Arc fix.

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 501ed01..0370ef6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1294,12 +1294,12 @@ namespace cppcanvas
 B2DSize mappedSize( MapSize (dw/2, dh/2));
 
 float endAngle = startAngle + sweepAngle;
-startAngle = fmod (startAngle, M_PI*2);
+startAngle = fmodf (startAngle, M_PI*2);
 if (startAngle < 0)
-startAngle += M_PI*2;
-endAngle = fmod (endAngle, M_PI*2);
+startAngle += static_cast(M_PI*2);
+endAngle = fmodf (endAngle, M_PI*2);
 if (endAngle < 0)
-endAngle += M_PI*2;
+endAngle += static_cast(M_PI*2);
 if (sweepAngle < 0)
 std::swap (endAngle, startAngle);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/toolkit sc/uiconfig

[Caolán McNamara]

 include/toolkit/awt/vclxprinter.hxx   |   56 +-
 sc/uiconfig/scalc/ui/scgeneralpage.ui |   19 ++-
 2 files changed, 38 insertions(+), 37 deletions(-)

New commits:
commit 6f2472b6cf849183b7d9f638e43fc0899ffb816b
Author: Caolán McNamara 
Date:   Mon Jun 10 11:51:18 2013 +0100

little cleanups of sc general options tab page

Change-Id: I07b3b16e5b9250b15d871fc05e217f1cc7e971d5

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index c8ed614..4f119f0 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -2,22 +2,23 @@
 
   
   
-5
-200
-1
-1
+0.5
+99.985
+1.25
+0.10001
+0.10001
   
   
 True
 False
 6
 vertical
-6
+12
 
   
 True
 False
-6
+12
 True
 
   
@@ -61,7 +62,7 @@
 0
 _Tab 
stops
 True
-tabmf:0,00mm
+tabmf:0.00mm
   
   
 0
@@ -71,7 +72,7 @@
   
 
 
-  
+  
 True
 True
 •
@@ -159,7 +160,7 @@
   
 True
 False
-12
+12
 
   
 True
commit 2b6b5da841120d45607fe7731b3f7941793e6153
Author: Caolán McNamara 
Date:   Mon Jun 10 11:50:50 2013 +0100

::OUString->OUString

Change-Id: If91077da9d032d69e67a9ef1caf94f6fa7551844

diff --git a/include/toolkit/awt/vclxprinter.hxx 
b/include/toolkit/awt/vclxprinter.hxx
index 1a04013..1d7aa05 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -76,12 +76,12 @@ public:
 
 // ::com::sun::star::beans::XPropertySet
 ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 
throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setPropertyValue( const ::OUString& rPropertyName, const 
::com::sun::star::uno::Any& aValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { 
OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); }
-::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::OUString& 
rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { return 
OPropertySetHelper::getPropertyValue( rPropertyName ); }
-void SAL_CALL addPropertyChangeListener( const ::OUString& rPropertyName, 
const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertyChangeListener >& rxListener ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { 
OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); }
-void SAL_CALL removePropertyChangeListener( const ::OUString& 
rPropertyName, const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertyChangeListener >& rxListener ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { 
OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); }
-void SAL_CALL addVetoableChangeListener( const ::OUString& rPropertyName, 
const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XVetoableChangeListener >& rxListener ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { 
OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); }
-void SAL_CALL removeVetoableChangeListener( const ::OUString& 
rPropertyName, const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XVetoableChangeListener >& rxListener ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) { 
OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); }
+void SAL_CALL setPropertyValue( const OUString& rPropertyName, const 
::com::sun::star::uno::Any& aValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::lang

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 65241, which changed state.

Bug 65241 Summary: FORMATTING: Incorrect formatting text and colors of cells 
when opening in xlsx-files in Calc
https://bugs.freedesktop.org/show_bug.cgi?id=65241

   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: sfx2/source svx/source

[Caolán McNamara]

 sfx2/source/sidebar/Theme.cxx  |5 +
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 09b054fc4c2a8d9ee2a6ed28194b828d8ff7dd0f
Author: Caolán McNamara 
Date:   Mon Jun 10 11:29:03 2013 +0100

update graphicrepository links for new icon-theme locations

Change-Id: I8de2dbfa6eb98a9b879af362b850c487ab28fa7f

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index a234215..967adc7 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -363,10 +363,7 @@ void Theme::UpdateTheme (void)
 Any(A2S("private:graphicrepository/sfx2/res/closedoc.png")));
 setPropertyValue(
 maPropertyIdToNameMap[Image_CloseIndicator],
-Any(
-mbIsHighContrastMode
-? 
A2S("private:graphicrepository/res/commandimagelist/lch_decrementlevel.png")
-: 
A2S("private:graphicrepository/res/commandimagelist/lc_decrementlevel.png")));
+Any(A2S("private:graphicrepository/cmd/lc_decrementlevel.png")));
 setPropertyValue(
 maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
 Any(
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 6db5c75..fa6009f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -199,7 +199,7 @@ Control RID_SIDEBAR_PARA_PANEL
 defined for Draw/Impress.  It has to be defined in
 GenericCommancs.xcu to be recognized. See issue 122446 for 
more details.
 */
-Command = 
"private:graphicrepository/res/commandimagelist/sc_paraspaceincrease.png";
+Command = 
"private:graphicrepository/cmd/sc_paraspaceincrease.png";
 };
 ToolBoxItem
 {
@@ -209,7 +209,7 @@ Control RID_SIDEBAR_PARA_PANEL
 /** See above or issue 122446 why the following line is not
 Command = ".uno:ParaspaceDecrease";
 */
-Command = 
"private:graphicrepository/res/commandimagelist/sc_paraspacedecrease.png";
+Command = 
"private:graphicrepository/cmd/sc_paraspacedecrease.png";
 };
 };
 };
___
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' - 3 commits - canvas/source sfx2/source slideshow/source svx/source

[Caolán McNamara]

 canvas/source/cairo/cairo_textlayout.cxx   |1 
 sfx2/source/sidebar/Theme.cxx  |5 
--
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   19 
+-
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |4 
+-
 4 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 2c4bb786a8a049bb5c230c9f2fdb7dc654926ce1
Author: Caolán McNamara 
Date:   Mon Jun 10 11:29:03 2013 +0100

update graphicrepository links for new icon-theme locations

Change-Id: I8de2dbfa6eb98a9b879af362b850c487ab28fa7f
(cherry picked from commit 09b054fc4c2a8d9ee2a6ed28194b828d8ff7dd0f)

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index a234215..967adc7 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -363,10 +363,7 @@ void Theme::UpdateTheme (void)
 Any(A2S("private:graphicrepository/sfx2/res/closedoc.png")));
 setPropertyValue(
 maPropertyIdToNameMap[Image_CloseIndicator],
-Any(
-mbIsHighContrastMode
-? 
A2S("private:graphicrepository/res/commandimagelist/lch_decrementlevel.png")
-: 
A2S("private:graphicrepository/res/commandimagelist/lc_decrementlevel.png")));
+Any(A2S("private:graphicrepository/cmd/lc_decrementlevel.png")));
 setPropertyValue(
 maPropertyIdToNameMap[Image_ToolBoxItemSeparator],
 Any(
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 6db5c75..fa6009f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -199,7 +199,7 @@ Control RID_SIDEBAR_PARA_PANEL
 defined for Draw/Impress.  It has to be defined in
 GenericCommancs.xcu to be recognized. See issue 122446 for 
more details.
 */
-Command = 
"private:graphicrepository/res/commandimagelist/sc_paraspaceincrease.png";
+Command = 
"private:graphicrepository/cmd/sc_paraspaceincrease.png";
 };
 ToolBoxItem
 {
@@ -209,7 +209,7 @@ Control RID_SIDEBAR_PARA_PANEL
 /** See above or issue 122446 why the following line is not
 Command = ".uno:ParaspaceDecrease";
 */
-Command = 
"private:graphicrepository/res/commandimagelist/sc_paraspacedecrease.png";
+Command = 
"private:graphicrepository/cmd/sc_paraspacedecrease.png";
 };
 };
 };
commit 2c8bd541ee804523fb8933ec4591251546f47dfd
Author: Mark Wielaard 
Date:   Sat Jun 8 00:51:45 2013 +0200

Fix memory leak in OGLTransitionerImpl::createWindow.

XFree the result of glXChooseVisual, glXGetVisualFromFBConfig and
glXGetFBConfigs when done.

Change-Id: I145c7f5f083718d983ccea4b534d4e90056eb14e
Reviewed-on: https://gerrit.libreoffice.org/4195
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit a775188f6bbf3bbf8448b2b7398a1902908bb5e2)

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 3c12fee..65c992a 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -537,7 +537,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
 for ( ; i < nfbconfigs; i++)
 {
 visinfo = glXGetVisualFromFBConfig (GLWin.dpy, fbconfigs[i]);
-if( !visinfo || visinfo->visualid != vi->visualid )
+if( !visinfo )
+continue;
+
+unx::VisualID visualid = visinfo->visualid;
+XFree ( visinfo );
+
+if ( visualid != vi->visualid )
 continue;
 
 glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], 
GLX_DRAWABLE_TYPE, &value);
@@ -565,11 +571,14 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
 /* TODO: handle non Y inverted cases */
 break;
 }
+if (vi != firstVisual)
+XFree (vi);
 
 if( i != nfbconfigs ) {
 vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] );
 mbHasTFPVisual = true;
 pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow 
);
+XFree ( vi );
 SAL_INFO("slideshow.opengl", "found visual suitable for 
texture_from_pixmap");
 } else if( firstVisual && pAttributeTable[1] == NULL ) {
 vi = firstVisual;
@@ -577,8 +586,10 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindo

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

[Michael Stahl]

 cppcanvas/source/mtfrenderer/emfplus.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5d91b8390c06e5c4e887f6398f21a5789f6abb40
Author: Michael Stahl 
Date:   Fri Jun 7 20:54:33 2013 +0200

cppcanvas: try to make MSVC tinderbox happy

Change-Id: If4fd5a788d3907a986e27f5f53d5995c7035f685

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index bb87728..9d9c311 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1343,12 +1343,12 @@ namespace cppcanvas
 B2DSize mappedSize( MapSize (dw/2, dh/2));
 
 float endAngle = startAngle + sweepAngle;
-startAngle = fmod (startAngle, M_PI*2);
+startAngle = fmodf(startAngle, M_PI*2);
 if (startAngle < 0)
-startAngle += M_PI*2;
-endAngle = fmod (endAngle, M_PI*2);
+startAngle += static_cast(M_PI*2);
+endAngle = fmodf(endAngle, M_PI*2);
 if (endAngle < 0)
-endAngle += M_PI*2;
+endAngle += static_cast(M_PI*2);
 
 if (sweepAngle < 0)
 std::swap (endAngle, startAngle);
___
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' - 2 commits - e9/bfcd0982bcb67071b344da377158fc0d88d8a6 f4/f2c3189e5fc9f6fac57b5a6df0840ecdaaa731

[Caolán McNamara]

 e9/bfcd0982bcb67071b344da377158fc0d88d8a6 |1 +
 f4/f2c3189e5fc9f6fac57b5a6df0840ecdaaa731 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 72cfe0fc0130b198537d230688178fcb19ded0c5
Author: Caolán McNamara 
Date:   Mon Jun 10 11:27:29 2013 +0100

Notes added by 'git notes add'

diff --git a/f4/f2c3189e5fc9f6fac57b5a6df0840ecdaaa731 
b/f4/f2c3189e5fc9f6fac57b5a6df0840ecdaaa731
new file mode 100644
index 000..97115f4
--- /dev/null
+++ b/f4/f2c3189e5fc9f6fac57b5a6df0840ecdaaa731
@@ -0,0 +1 @@
+merged as: 34a1250e0b4bf62dbf87ff6139fc3107f7543b82
commit 24973a0472f7f86bac2ae436d1d8782f757b9ffd
Author: Caolán McNamara 
Date:   Mon Jun 10 11:27:21 2013 +0100

Notes added by 'git notes add'

diff --git a/e9/bfcd0982bcb67071b344da377158fc0d88d8a6 
b/e9/bfcd0982bcb67071b344da377158fc0d88d8a6
new file mode 100644
index 000..97115f4
--- /dev/null
+++ b/e9/bfcd0982bcb67071b344da377158fc0d88d8a6
@@ -0,0 +1 @@
+merged as: 34a1250e0b4bf62dbf87ff6139fc3107f7543b82
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 07/abf70e9ecfca7e7898929259263bb307766374 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f3e5326a84b4b374faca197da8dd2092183700c
Author: Caolán McNamara 
Date:   Mon Jun 10 11:26:59 2013 +0100

Notes added by 'git notes add'

diff --git a/07/abf70e9ecfca7e7898929259263bb307766374 
b/07/abf70e9ecfca7e7898929259263bb307766374
new file mode 100644
index 000..6ccf679
--- /dev/null
+++ b/07/abf70e9ecfca7e7898929259263bb307766374
@@ -0,0 +1 @@
+merged as: 6858934fadcbe825ef59a3c7da4f82879163382b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/toolkit sd/source toolkit/source

[Armin Le Grand]

 include/toolkit/awt/vclxprinter.hxx|  117 +
 sd/source/ui/tools/PreviewRenderer.cxx |   30 +---
 toolkit/source/awt/vclxprinter.cxx |   94 +-
 3 files changed, 89 insertions(+), 152 deletions(-)

New commits:
commit e86a67313e0fbd3c263497684c8d98f1a00d32e7
Author: Armin Le Grand 
Date:   Fri Oct 19 15:27:03 2012 +

Resolves: #i121224# Corrected to use the ApplicationDocumentColor...

instead of the ApplicationBackgroundColor

(cherry picked from commit 8d005e90cfee08663c02db2e75130b68bf143a93)

Conflicts:
sd/source/ui/tools/PreviewRenderer.cxx

Change-Id: I5bb3d40724dbcca189fac8c9ba29b684b0b9ec67

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx 
b/sd/source/ui/tools/PreviewRenderer.cxx
index 9a355aa..64b17f0 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -274,16 +274,28 @@ bool PreviewRenderer::Initialize (
 if (pPageView == NULL)
 return false;
 
-// Set background color of page view and outliner.
-svtools::ColorConfig aColorConfig;
-const Color aPageBackgroundColor(pPage->GetPageBackgroundColor(pPageView));
-pPageView->SetApplicationBackgroundColor(aPageBackgroundColor);
-SdrOutliner& rOutliner (pDocument->GetDrawOutliner(NULL));
-rOutliner.SetBackgroundColor(aPageBackgroundColor);
+// #i121224# No need to set SetApplicationBackgroundColor (which is the 
color
+// of the area 'behind' the page (formally called 'Wiese') since the page 
previews
+// produced exactly cover the page's area, so it would never be visible. 
What
+// needs to be set is the ApplicationDocumentColor which is derived from
+// svtools::DOCCOLOR normally
+Color aApplicationDocumentColor;
+
+if (pPageView->GetApplicationDocumentColor() == COL_AUTO)
+{
+svtools::ColorConfig aColorConfig;
+aApplicationDocumentColor = aColorConfig.GetColorValue( 
svtools::DOCCOLOR ).nColor;
+}
+else
+{
+aApplicationDocumentColor = pPageView->GetApplicationDocumentColor();
+}
+
+pPageView->SetApplicationDocumentColor(aApplicationDocumentColor);
+SdrOutliner& rOutliner(pDocument->GetDrawOutliner(NULL));
+rOutliner.SetBackgroundColor(aApplicationDocumentColor);
 rOutliner.SetDefaultLanguage(pDocument->GetLanguage(EE_CHAR_LANGUAGE));
-mpView->SetApplicationBackgroundColor(
-Color(aColorConfig.GetColorValue(svtools::APPBACKGROUND).nColor));
-mpPreviewDevice->SetBackground(Wallpaper(aPageBackgroundColor));
+mpPreviewDevice->SetBackground(Wallpaper(aApplicationDocumentColor));
 mpPreviewDevice->Erase();
 
 return true;
commit 6858934fadcbe825ef59a3c7da4f82879163382b
Author: Ariel Constenla-Haile 
Date:   Sat Oct 6 01:44:09 2012 +

Resolves: #i121170# - com::sun::star::awt::XPrinter API does nothing

(cherry picked from commit 07abf70e9ecfca7e7898929259263bb307766374)

Change-Id: I0b11a4a6337f0928ca43d4eb511831f5f96a246e

diff --git a/toolkit/source/awt/vclxprinter.cxx 
b/toolkit/source/awt/vclxprinter.cxx
index 209040b..69934d5 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -279,7 +279,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, 
sal_Int16 /*nCopies*/
 ::osl::MutexGuard aGuard( Mutex );
 
 sal_Bool bDone = sal_True;
-if ( mpListener.get() )
+if ( mpPrinter.get() )
 {
 maInitJobSetup = mpPrinter->GetJobSetup();
 mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
commit 34a1250e0b4bf62dbf87ff6139fc3107f7543b82
Author: Andrew Rist 
Date:   Fri Oct 5 19:15:10 2012 +

Related: #i117765# css.awt.PrinterServer implementation unusable in Basic

from  cws/fs35a by Frank Schoenheit [fs]

(cherry picked from commit e9bfcd0982bcb67071b344da377158fc0d88d8a6)

Conflicts:
toolkit/inc/toolkit/awt/vclxprinter.hxx
toolkit/source/awt/vclxprinter.cxx

Change-Id: I96b08d00c7e483891d3c24c90fa52764949add0b

Fix line endings

(cherry picked from commit f4f2c3189e5fc9f6fac57b5a6df0840ecdaaa731)

Conflicts:
toolkit/inc/toolkit/awt/vclxprinter.hxx
toolkit/source/awt/vclxprinter.cxx

Change-Id: I88acd74eec39410844030d3cba489e1fe62a91b3

diff --git a/include/toolkit/awt/vclxprinter.hxx 
b/include/toolkit/awt/vclxprinter.hxx
index a3aca63..1a04013 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -25,16 +25,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
-#include 
 #include 
-#include 
 #include 
+#include 
+#include 
 
 #include "vcl/oldprintadaptor.hxx"
 
@@ -51,10 +49,11 @@
 //  class VCLXPrinterPropertySet
 //  
 
-class VCLXPrinterPropertySet :  public 
::com::sun::star::awt::XPrinterPr

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/005e90cfee08663c02db2e75130b68bf143a93

[Caolán McNamara]

 8d/005e90cfee08663c02db2e75130b68bf143a93 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 99635c415b68d632929e52f6f14b296c719c0f61
Author: Caolán McNamara 
Date:   Mon Jun 10 11:26:40 2013 +0100

Notes added by 'git notes add'

diff --git a/8d/005e90cfee08663c02db2e75130b68bf143a93 
b/8d/005e90cfee08663c02db2e75130b68bf143a93
new file mode 100644
index 000..e1d2dff
--- /dev/null
+++ b/8d/005e90cfee08663c02db2e75130b68bf143a93
@@ -0,0 +1 @@
+merged as: e86a67313e0fbd3c263497684c8d98f1a00d32e7
___
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' - wizards/com wizards/Jar_report.mk

[Stephan Bergmann]

 wizards/Jar_report.mk   |2 ++
 wizards/com/sun/star/wizards/report/MANIFEST.MF |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 80a7b52ba4903d4112ea8edef57f082756221d56
Author: Stephan Bergmann 
Date:   Mon Jun 10 11:10:47 2013 +0200

fdo#65168: Fix previous fix, Class-Path is built up in solenv/gbuild/Jar.mk

...and must not be hard-coded in the manifest input (else report.jar was 
missing
the link to commonwizards.jar, so at least --disable-report-builder builds
failed with java.lang.NoClassDefFoundError).

Change-Id: I81cdadb599c7bf9a4a4503924dab4fbf9d60b44f
(cherry picked from commit 5d4c41587dde658c9bfcb1638e0373608163bec2)

diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 010c990..50e9615 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_Jar_use_jars,report,\
 
 $(eval $(call 
gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF))
 
+$(eval $(call gb_Jar_add_manifest_classpath,report,reportbuilderwizard.jar))
+
 $(eval $(call gb_Jar_set_packageroot,report,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,report,\
diff --git a/wizards/com/sun/star/wizards/report/MANIFEST.MF 
b/wizards/com/sun/star/wizards/report/MANIFEST.MF
index 2dda41a..1a4f8da 100644
--- a/wizards/com/sun/star/wizards/report/MANIFEST.MF
+++ b/wizards/com/sun/star/wizards/report/MANIFEST.MF
@@ -1,3 +1,2 @@
-Class-Path: reportbuilderwizard.jar
 RegistrationClassName: com.sun.star.wizards.report.CallReportWizard
 UNO-Type-Path: 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

[Faisal M . Al-Otaibi]

 sc/UIConfig_scalc.mk  |1 
 sc/inc/helpids.h  |1 
 sc/inc/sc.hrc |1 
 sc/source/ui/inc/optdlg.hrc   |   21 -
 sc/source/ui/inc/tpview.hxx   |   37 +-
 sc/source/ui/optdlg/tpview.cxx|  186 ++---
 sc/source/ui/src/optdlg.src   |  179 -
 sc/source/ui/src/scstring.src |   15 +
 sc/uiconfig/scalc/ui/scgeneralpage.ui |  460 ++
 9 files changed, 582 insertions(+), 319 deletions(-)

New commits:
commit 813e8bc2268d74a2e7ce2d9f1cb5ae9c412086a6
Author: Faisal M. Al-Otaibi 
Date:   Mon Jun 10 11:53:21 2013 +0200

Convert sc general option page to .ui format

Change-Id: I06487f74b8dfdf27b067c1bdb6e47a5fa8babf30

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8fc9e35..9e7fb46 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
+   sc/uiconfig/scalc/ui/scgeneralpage \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index afef8bb..15086f9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -68,7 +68,6 @@
 #define HID_SCPAGE_SUBT_GROUP3  
"SC_HID_SCPAGE_SUBT_GROUP3"
 
 #define HID_SCPAGE_CONTENT  
"SC_HID_SCPAGE_CONTENT"
-#define HID_SCPAGE_LAYOUT   
"SC_HID_SCPAGE_LAYOUT"
 
 #define HID_SC_NAVIGATOR
"SC_HID_SC_NAVIGATOR"
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7b823b0..e98448c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -830,6 +830,7 @@
 #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
 #define SCSTR_ORIENTATION_STANDARD  (STR_START + 112)
 #define SCSTR_AUTHOR(STR_START + 113)
+#define SCSTR_UNIT  (STR_START + 114)
 
 // accessibility
 
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 4103d54..d815de1 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -77,16 +77,11 @@
 #define CB_SYNCZOOM 35
 
 // TP_LAYOUT
-#define GB_LINK 1
-#define RB_ALWAYS   2
-#define RB_REQUEST  3
-#define RB_NEVER4
 #define CB_DOCONLY  5
 #define CB_MERGE_PARA_DIST  6
 #define GB_COMPAT   7
 #define CB_AUTO_UPDATE_FIELDS   8
 #define CB_AUTO_UPDATE_CHARTS   9
-#define FT_UPDATE_LINKS 10
 
 #define GB_WINDOW   50
 #define CB_ROWCOLHEADER 51
@@ -98,30 +93,14 @@
 #define FT_COLOR58
 #define LB_COLOR59
 #define CB_GUIDELINE60
-#define GB_UNIT 61
-#define LB_UNIT 62
-#define ST_UNIT 63
-#define MF_TAB  65
 #define CB_PAGEBREAKS   66
-#define FT_TAB  69
-#define FT_UNIT 70
 #define FL_SEPARATOR1   71
 #define FL_SEPARATOR2   72
-#define FL_SEPARATOR73
 #define FT_GRID 74
 #define LB_GRID 75
 
 // TP_INPUT
-#define GB_OPTIONS  70
-#define CB_ALIGN71
-#define LB_ALIGN72
-#define CB_EDITMODE 73
-#define CB_FORMAT   74
 #define CB_RFIND75
-#define CB_EXPREF   76
-#define CB_MARKHDR  77
-#define CB_TEXTFMT  78
-#define CB_REPLWARN 79
 
 
 // TP_FORMULA
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0bb22a5..7f786cb 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -103,28 +103,21 @@ public:
 class ScDocument;
 class ScTpLayoutOptions : public SfxTabPage
 {
-FixedLine   aUnitGB;
-FixedText   aUnitFT;
-ListBox aUnitLB;
-FixedText   aTabFT;
-MetricField aTabMF;
-
-FixedLine   aSeparatorFL;
-FixedLine   aLinkGB;
-FixedText   aLinkFT;
-RadioButton aAlwaysRB;
-RadioButton aRequestRB;
-RadioButton aNeverRB;
-
-FixedLine   aOptionsGB;
-CheckBoxaAlignCB;
-ListBox aAlignLB;
-CheckBoxaEditModeCB;
-CheckBoxaFormatCB;
-CheckBoxaExpRefCB;
-CheckBoxaMarkHdrCB;
-CheckBoxaTextFmtCB;
-CheckBoxaReplWarnCB;
+ListBox*m_pUnitLB;
+MetricField*m_pTabMF;
+
+RadioButton*m_pAlwaysRB;
+RadioButton*m_pRequestRB;
+RadioButton*m_pNeverRB;
+
+CheckBox*   m_pAlignCB;
+ListBox*m_pAlignLB;
+CheckBox*   m_pEditModeCB;
+CheckBox*   m_pFormatCB;
+CheckBox*   m_pExpRefCB;
+CheckBox*   m_pMarkHdrCB;
+CheckBox*   m_pTextFmtCB;
+CheckBox*   m_pReplWarnCB;
 
 SvxStringArray  aUnitArr;
 
diff --

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

[Matteo Casalin]

 sw/inc/pam.hxx|2 +-
 sw/qa/core/uwriter.cxx|2 +-
 sw/source/core/crsr/pam.cxx   |   12 ++--
 sw/source/ui/docvw/edtwin.cxx |   10 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 2f7ed5fb633978f30d77d944ab626efc8a04db50
Author: Matteo Casalin 
Date:   Sun Jun 9 11:47:16 2013 +0200

String to OUString

Change-Id: I89f228b64c85b5844b3049206bf97877473a04d3
Reviewed-on: https://gerrit.libreoffice.org/4212
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 54c20b1..7003b64 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -298,7 +298,7 @@ public:
 
 DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
 
-String GetTxt() const;
+OUString GetTxt() const;
 void InvalidatePaM();
 };
 
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 249f838..20f974f 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -920,7 +920,7 @@ void SwDocTest::testTransliterate()
 m_pDoc->InsertString(aPaM, OUString("foobar"));
 aPaM.SetMark();
 aPaM.GetPoint()->nContent = 0;
-CPPUNIT_ASSERT_EQUAL(String("foobar"), aPaM.GetTxt());
+CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetTxt());
 
 CPPUNIT_ASSERT_EQUAL(OUString("FOOBAR"),
 translitTest(*m_pDoc, aPaM,
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index cb89473..c1b059b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1059,9 +1059,9 @@ sal_Bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
 return sal_True;
 }
 
-String SwPaM::GetTxt() const
+OUString SwPaM::GetTxt() const
 {
-String aResult;
+OUString aResult;
 
 SwNodeIndex aNodeIndex = Start()->nNode;
 
@@ -1082,7 +1082,7 @@ String SwPaM::GetTxt() const
 
 if (pTxtNode != NULL)
 {
-const String & aTmpStr = pTxtNode->GetTxt();
+const OUString aTmpStr = pTxtNode->GetTxt();
 
 if (aNodeIndex == Start()->nNode)
 {
@@ -1090,13 +1090,13 @@ String SwPaM::GetTxt() const
 if (End()->nNode == aNodeIndex)
 nEnd = End()->nContent.GetIndex();
 else
-nEnd = aTmpStr.Len();
+nEnd = aTmpStr.getLength();
 
-aResult += aTmpStr.Copy(Start()->nContent.GetIndex(),
+aResult += aTmpStr.copy(Start()->nContent.GetIndex(),
 nEnd - Start()->nContent.GetIndex()) ;
 }
 else if (aNodeIndex == End()->nNode)
-aResult += aTmpStr.Copy(0, End()->nContent.GetIndex());
+aResult += aTmpStr.copy(0, End()->nContent.GetIndex());
 else
 aResult += aTmpStr;
 }
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 39526b9..f0b1951 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -860,16 +860,16 @@ void SwEditWin::FlushInBuffer()
 if (!rSh.GetCrsr()->HasMark())
 rSh.GetCrsr()->SetMark();
 rSh.GetCrsr()->GetMark()->nContent = 0;
-String aLeftText( rSh.GetCrsr()->GetTxt() );
+OUString aLeftText( rSh.GetCrsr()->GetTxt() );
 
 SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
 
 xub_StrLen nExpandSelection = 0;
-if (aLeftText.Len() > 0)
+if (aLeftText.getLength() > 0)
 {
 sal_Unicode cChar = '\0';
 
-xub_StrLen nTmpPos = aLeftText.Len();
+sal_Int32 nTmpPos = aLeftText.getLength();
 sal_Int16 nCheckMode = 
rCTLOptions.IsCTLSequenceCheckingRestricted() ?
 i18n::InputSequenceCheckMode::STRICT : 
i18n::InputSequenceCheckMode::BASIC;
 
@@ -880,7 +880,7 @@ void SwEditWin::FlushInBuffer()
 for (xub_StrLen k = 0;  k < m_aInBuffer.Len();  ++k)
 {
 cChar = m_aInBuffer.GetChar(k);
-const xub_StrLen nPrevPos = 
static_cast(xISC->correctInputSequence( aNewText, nTmpPos - 1, 
cChar, nCheckMode ));
+const sal_Int32 nPrevPos =xISC->correctInputSequence( 
aNewText, nTmpPos - 1, cChar, nCheckMode );
 
 // valid sequence or sequence could be corrected:
 if (nPrevPos != aNewText.getLength())
@@ -903,7 +903,7 @@ void SwEditWin::FlushInBuffer()
 if (aChgText.Len())
 {
 m_aInBuffer = aChgText;
-nExpandSelection = aLeftText.Len() - static_cast< 
xub_StrLen >(nChgPos);
+nExpandSelection = static_cast< xub_StrLen 
>(aLeftText.getLength() - nChgPos);
 }
 else
 m_aInBuffer.Erase();

[Libreoffice-commits] core.git: configure.ac m4/libo_externals.m4

[Stephan Bergmann]

 configure.ac |   32 +++-
 m4/libo_externals.m4 |1 +
 2 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit df7dcd3982c80031bda141822a469fd5cc6f
Author: Stephan Bergmann 
Date:   Mon Jun 10 11:18:21 2013 +0200

More systematic *_CFLAGS s/-I/-isystem/

...to avoid compiler warnings in external headers.

Change-Id: Ibd7fcb0400bfd8ffa49cc8db77956e443551ebb3

diff --git a/configure.ac b/configure.ac
index 374fd40..070b0a45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7143,6 +7143,7 @@ if test "$with_system_clucene" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_CLUCENE=YES
 PKG_CHECK_MODULES(CLUCENE, libclucene-core)
+CLUCENE_CFLAGS=$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 save_CPPFLAGS=$CPPFLAGS
@@ -7254,6 +7255,7 @@ if test  "$test_freetype" = "yes"; then
 # 9.4.3 is 2.1.5; the first FreeType release to provide a freetype2.pc file
 # XXX: replace this with a real minimum required version
 PKG_CHECK_MODULES( FREETYPE, freetype2 >= 9.4.3 )
+FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 SYSTEM_FREETYPE=YES
 fi
 AC_SUBST(FREETYPE_CFLAGS)
@@ -7299,7 +7301,9 @@ if test "$with_system_libxml" = "yes"; then
 LIBEXSLT_LIBS="-lexslt $LIBXSLT_LIBS"
 else
 PKG_CHECK_MODULES(LIBXSLT, libxslt)
+LIBXSLT_CFLAGS=$(printf '%s' "$LIBXSLT_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 PKG_CHECK_MODULES(LIBEXSLT, libexslt)
+LIBEXSLT_CFLAGS=$(printf '%s' "$LIBEXSLT_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 fi
 
 dnl Check for xsltproc
@@ -7356,6 +7360,7 @@ if test "$with_system_libxml" = "yes"; then
 LIBXML_LIBS="-L$usr/lib -lxml2 -liconv"
 else
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
+LIBXML_CFLAGS=$(printf '%s' "$LIBXML_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 fi
 
 dnl Check for xmllint
@@ -7941,7 +7946,7 @@ if test "$with_system_curl" = "yes"; then
 AC_MSG_ERROR([install the libcurl development package])
 fi
 CURL_LIBS=`$CURLCONFIG --libs`
-CURL_CFLAGS=`$CURLCONFIG --cflags`
+CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
 curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
 fi
 
@@ -8224,7 +8229,7 @@ if test "$with_system_npapi_headers" = "yes"; then
 ])
 CFLAGS=$save_CFLAGS
 AC_LANG_POP([C])
-NPAPI_HEADERS_CFLAGS="`echo $NPAPI_HEADERS_CFLAGS | sed -e 
\"s/-I/${ISYSTEM}/g\"`"
+NPAPI_HEADERS_CFLAGS=$(printf '%s' "$NPAPI_HEADERS_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 else
 AC_MSG_RESULT([internal])
 dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or
@@ -8495,6 +8500,7 @@ AC_MSG_CHECKING([whether to use Xrender])
 if test "$WANT_X11" = "yes" -a  "$test_xrender" = "yes"; then
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES(XRENDER, xrender)
+XRENDER_CFLAGS=$(printf '%s' "$XRENDER_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 AC_CHECK_LIB([Xrender], [XRenderQueryVersion], [:],
   [AC_MSG_ERROR(libXrender not found or functional)], [])
 AC_MSG_CHECKING([which Xrender headers to use])
@@ -8532,6 +8538,7 @@ if test "$WANT_X11" = "yes" -a "$test_randr" = "yes" -a 
\( "$enable_randr" = "ye
 XRANDR_LIBS="-lXrandr "
 ENABLE_RANDR="TRUE"
 fi
+XRANDR_CFLAGS=$(printf '%s' "$XRANDR_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 fi
 else
 ENABLE_RANDR=""
@@ -8717,7 +8724,7 @@ if test "$with_system_hunspell" = "yes"; then
 fi
 AC_LANG_POP([C++])
 libo_MINGW_CHECK_DLL([libhunspell-1.3])
-HUNSPELL_CFLAGS="`echo $HUNSPELL_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`"
+HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 else
 AC_MSG_RESULT([internal])
 SYSTEM_HUNSPELL=NO
@@ -8784,6 +8791,7 @@ if test "$with_system_mythes" = "yes"; then
 fi
 AC_LANG_POP([C++])
 libo_MINGW_CHECK_DLL([libmythes-1.2])
+MYTHES_CFLAGS=$(printf '%s' "$MYTHES_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 else
 AC_MSG_RESULT([internal])
 SYSTEM_MYTHES=NO
@@ -9209,6 +9217,7 @@ if test "x$enable_gtk3" = "xyes"; then
 else
 AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
 fi
+GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 fi
 AC_SUBST(GTK3_LIBS)
 AC_SUBST(GTK3_CFLAGS)
@@ -9279,6 +9288,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" 
!= "iOS" -a "$enable_g
 ENABLE_GCONF="TRUE"
 AC_MSG_RESULT([yes])
 PKG_CHECK_MODULES( GCONF, gconf-2.0 gobject-2.0 )
+GCONF_CFLAGS=$(printf '%s' "$GCONF_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 else
 AC_MSG_RESULT([no])
 fi
@@ -9296,6 +9306,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a 
"$enable_gnome_vfs" = "yes" -
 ENABLE_GNOMEVFS="TRUE"
 AC_MSG_

Re: [GSoC] Android Impress Remote: Weekly Report #0

[Tor Lillqvist]

But isn't the only reason why the Impress Remote Control for Android is in
the same source code repository as LibreOffice itself that it needs to be
able to use the same translation infrastructure/procedure/results smoothly?

The Remote Control does not use any LibreOffice (native) code, and it
doesn't really use the LibreOffice gbuild mechanism either.

Maybe now then would be a good time to split out it for real into a
separate repository(and take care of the translation some other way)? Then
it could use whatever build mechanisms that are natural to Android
developer and wouldn't need to be restricted by LibreOffice.

(The same holds for the Remote Control for iOS that is being created this
year's GSoC.)

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

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

[Noel Grandin]

 include/tools/diagnose_ex.h  |4 ++--
 tools/source/debug/debug.cxx |7 +--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 9d7ca4853773b4e679b8712d5c49413e67345918
Author: Noel Grandin 
Date:   Fri Jun 7 14:44:48 2013 +0200

fix file and lineno info for DBG_UNHANDLED_EXCEPTION

which I broke in commit 863d38fbfa4fb4861e476828c46410602100919e
"move DBG_UNHANDLED_EXCEPTION out of line"

Change-Id: Ic30e985cc356d81013ced1ce74ec6c78469d9882
(cherry picked from commit 2cb247a12d682d7cda0483570b38b4469c360a94)

diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 4c27193..50a400d 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -42,7 +42,7 @@
 #include 
 #include 
 
-TOOLS_DLLPUBLIC void DbgUnhandledException(const 
::com::sun::star::uno::Any& caughtException, const char* currentFunction);
+TOOLS_DLLPUBLIC void DbgUnhandledException(const 
::com::sun::star::uno::Any& caughtException, const char* currentFunction, const 
char* fileAndLineNo);
 
 /** reports a caught UNO exception via OSL diagnostics
 
@@ -50,7 +50,7 @@
 handling is not correct 
 */
 #define DBG_UNHANDLED_EXCEPTION()   \
-DbgUnhandledException( ::cppu::getCaughtException(), 
BOOST_CURRENT_FUNCTION);
+DbgUnhandledException( ::cppu::getCaughtException(), 
BOOST_CURRENT_FUNCTION, SAL_DETAIL_WHERE);
 
 #else   // OSL_DEBUG_LEVEL
 #define DBG_UNHANDLED_EXCEPTION()
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 3f950ca..49da308 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1589,7 +1589,7 @@ void DbgOutf( const sal_Char*, ... ) {}
 
 #if OSL_DEBUG_LEVEL > 0
 
-TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const 
char* currentFunction)
+TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const 
char* currentFunction, const char* fileAndLineNo)
 {
 OString sMessage( "caught an exception!" );
 sMessage += "\nin function:";
@@ -1628,7 +1628,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const 
css::uno::Any & caught, const c
 }
 }
 sMessage += "\n";
-OSL_ENSURE( false, sMessage.getStr() );
+
+SAL_DETAIL_LOG_FORMAT(
+SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN,
+"legacy.osl", fileAndLineNo, "%s", sMessage.getStr());
 }
 
 #endif  // OSL_DEBUG_LEVEL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com wizards/Jar_report.mk

[Stephan Bergmann]

 wizards/Jar_report.mk   |2 ++
 wizards/com/sun/star/wizards/report/MANIFEST.MF |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5d4c41587dde658c9bfcb1638e0373608163bec2
Author: Stephan Bergmann 
Date:   Mon Jun 10 11:10:47 2013 +0200

fdo#65168: Fix previous fix, Class-Path is built up in solenv/gbuild/Jar.mk

...and must not be hard-coded in the manifest input (else report.jar was 
missing
the link to commonwizards.jar, so at least --disable-report-builder builds
failed with java.lang.NoClassDefFoundError).

Change-Id: I81cdadb599c7bf9a4a4503924dab4fbf9d60b44f

diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 010c990..50e9615 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_Jar_use_jars,report,\
 
 $(eval $(call 
gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/report/MANIFEST.MF))
 
+$(eval $(call gb_Jar_add_manifest_classpath,report,reportbuilderwizard.jar))
+
 $(eval $(call gb_Jar_set_packageroot,report,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,report,\
diff --git a/wizards/com/sun/star/wizards/report/MANIFEST.MF 
b/wizards/com/sun/star/wizards/report/MANIFEST.MF
index 2dda41a..1a4f8da 100644
--- a/wizards/com/sun/star/wizards/report/MANIFEST.MF
+++ b/wizards/com/sun/star/wizards/report/MANIFEST.MF
@@ -1,3 +1,2 @@
-Class-Path: reportbuilderwizard.jar
 RegistrationClassName: com.sun.star.wizards.report.CallReportWizard
 UNO-Type-Path: 
___
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' - sal/osl

[Isamu Mogi]

 sal/osl/w32/file_url.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a57644fd1ac197571c69cd3bbf67ec05c98dd74
Author: Isamu Mogi 
Date:   Tue Jun 4 13:10:44 2013 +

fdo#41226 Add error handling of recursed GetCaseCorrectPathNameEx()

This is a cherry-pick of 6d2e3bdac27ade56031d930c85e906c0d35877bc .

GetCaseCorrectPathNameEx() with bCheckExistence = true doesn't support 
windows
share path but occasionally it doesn't return failure and returns broken 
result.
For example, when we call with "\\USER-PC\Users\foo" then it converts the 
path
to "\Users\foo". And when "\Users\foo" exists, it returns "\Users\foo". It 
is
caused by missing error handling of searching for file "\\USER-PC". Also 
similar
bug possibly occurs even for local file path. This commit fixes these bugs.

Change-Id: I76ef5bcaf23252d427bd85565e7daec86978cea7
Reviewed-on: https://gerrit.libreoffice.org/4210
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 2527cbd..0eb19b3 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -486,7 +486,8 @@ static DWORD GetCaseCorrectPathNameEx(
 else
 bSkipThis = FALSE;
 
-GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence );
+if ( !GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence ) )
+return 0;
 
 PathAddBackslash( lpszPath, cchBuffer );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 59516, which changed state.

Bug 59516 Summary: FILEOPEN: Native MySQL-connector  couldnt be installed under 
Windows in LO 4.0
https://bugs.freedesktop.org/show_bug.cgi?id=59516

   What|Removed |Added

 Status|UNCONFIRMED |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 'libreoffice-4-1' - sal/osl

[Isamu Mogi]

 sal/osl/w32/file_url.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d074556e5a62d3b0029babcb02a3b7955a9eb084
Author: Isamu Mogi 
Date:   Tue Jun 4 13:10:44 2013 +

fdo#41226 Add error handling of recursed GetCaseCorrectPathNameEx()

This is a cherry-pick of 6d2e3bdac27ade56031d930c85e906c0d35877bc .

GetCaseCorrectPathNameEx() with bCheckExistence = true doesn't support 
windows
share path but occasionally it doesn't return failure and returns broken 
result.
For example, when we call with "\\USER-PC\Users\foo" then it converts the 
path
to "\Users\foo". And when "\Users\foo" exists, it returns "\Users\foo". It 
is
caused by missing error handling of searching for file "\\USER-PC". Also 
similar
bug possibly occurs even for local file path. This commit fixes these bugs.

Change-Id: If4e390fa99f27fcc2d458bc0f2f53d83bd03719b
Reviewed-on: https://gerrit.libreoffice.org/4211
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index fb1fa45..e9be895 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -486,7 +486,8 @@ static DWORD GetCaseCorrectPathNameEx(
 else
 bSkipThis = FALSE;
 
-GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence );
+if ( !GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence ) )
+return 0;
 
 PathAddBackslash( lpszPath, cchBuffer );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

hsqldb bits ...

[Michael Meeks]

Hi Andrzej,

I append some random code pointers / notes on hsqldb. In -theory- this
should be easy, since hsqldb by defualt stores it's data in a SQL dump - however
LibreOffice switched to an "optimised" binary store.

That leaves the table formats as SQL - which we will need to import 
first,
and then introspect the produced tables (I suspect) in order to decode the 
binary
format. We need to use the parsed table / type information from that
import to walk the binary dump of the database: I don't think it's going
to be too difficult with a few unit tests about the place :-)

I attach my (un-commented) and random code pointers from when I last
looked into doing that.

Hope it helps :-)

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

"Storage" property.

aProperties.put( "storage_class_name",
::rtl::OUString(  
"com.sun.star.sdbcx.comp.hsqldb.StorageAccess"  ) );
aProperties.put( "fileaccess_class_name",
::rtl::OUString(  
"com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess"  ) );

,


// JDBC driver and driver's classpath
aProperties.put( "JavaDriverClass",
::rtl::OUString(  "org.hsqldb.jdbcDriver"  ) );
aProperties.put( "JavaDriverClassPath",
::rtl::OUString(
#ifdef SYSTEM_HSQLDB
HSQLDB_JAR
" 
vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar"
#else

"vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar"
" 
vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar"
#endif
) );


connectivity/source/drivers/hsqldb/HDriver.cxx:
+ loads properties.


::rtl::OUString sConnPartURL = sSystemPath.copy( 0, ::std::max< 
sal_Int32 >( nIndex, sSystemPath.getLength() ) );
::rtl::OUString sKey = StorageContainer::registerStorage( 
xStorage, sConnPartURL );
aProperties.put( "storage_key", sKey );
aProperties.put( "storage_class_name",
::rtl::OUString(  
"com.sun.star.sdbcx.comp.hsqldb.StorageAccess"  ) );
aProperties.put( "fileaccess_class_name",
::rtl::OUString(  
"com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess"  ) );

+ so URL -> xStorage mapping ...



src/org/hsqldb/persist/DataFileCache.java:protected String   backupFileName;
src/org/hsqldb/persist/DataFileCache.java:// this flag is used externally 
to determine if a backup is required
src/org/hsqldb/persist/DataFileCache.java:backupFileName = baseFileName 
+ ".backup";
src/org/hsqldb/persist/DataFileCache.java: *  without backup.
src/org/hsqldb/persist/DataFileCache.java:
fa.removeElement(backupFileName);
src/org/hsqldb/persist/DataFileCache.java:backupFile();
src/org/hsqldb/persist/DataFileCache.java: *  Saves the *.data file as 
compressed *.backup.
src/org/hsqldb/persist/DataFileCache.java:void backupFile() throws 
IOException {
src/org/hsqldb/persist/DataFileCache.java:
ZipUnzipFile.compressFile(fileName, backupFileName + ".new",
src/org/hsqldb/persist/DataFileCache.java:if 
(fa.isStreamElement(backupFileName + ".new")) {
src/org/hsqldb/persist/DataFileCache.java:
fa.removeElement(backupFileName);
src/org/hsqldb/persist/DataFileCache.java:
fa.renameElement(backupFileName + ".new", backupFileName);
src/org/hsqldb/persist/DataFileCache.java:
fa.removeElement(backupFileName);
src/org/hsqldb/persist/LockFile.java:// safely checkpoint, backup 
and/or shut down that instance?  For
src/org/hsqldb/persist/LockFile.java:// backup location using a 
globally unique file name and then do a



Stream file in ScaledRAFile.java ...

src/org/hsqldb/rowio/RowOutputBinary.java
+ writeDate, writeTime 

RowInputBase:
public Object[] readData(int[] colTypes)
throws IOException, HsqlException {


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

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

[Caolán McNamara]

 62/589b11dbcb1e6aa557f9d7ecc284c51b281f65 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 547e3188158e9922412a394fc28533a2716049e8
Author: Caolán McNamara 
Date:   Mon Jun 10 09:39:27 2013 +0100

Notes added by 'git notes add'

diff --git a/62/589b11dbcb1e6aa557f9d7ecc284c51b281f65 
b/62/589b11dbcb1e6aa557f9d7ecc284c51b281f65
new file mode 100644
index 000..3cdf375c6
--- /dev/null
+++ b/62/589b11dbcb1e6aa557f9d7ecc284c51b281f65
@@ -0,0 +1 @@
+prefer: 5ade04867f280b18dfbfb7e60568ed58b32d6bbc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit dcfefd6676d8cf8930424724a509cce0d3612962
Author: Julien Nabet 
Date:   Sat Jun 8 15:28:55 2013 +0200

Related fdo#33895 add some checks against NULL derefs

Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48
Reviewed-on: https://gerrit.libreoffice.org/4199
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 205f821..fc6eb3e 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1161,8 +1161,13 @@ void OOXMLFastContextHandler::resolveFooter
 // Add the data pointed to by the reference as another property.
 void OOXMLFastContextHandler::resolveData(const OUString & rId)
 {
+OOXMLDocument * objDocument = getDocument();
+SAL_WARN_IF(!objDocument, "writerfilter", "no document to resolveData");
+if (!objDocument)
+return;
+
 uno::Reference xInputStream
-(mpParserState->getDocument()->getInputStreamForId(rId));
+(objDocument->getInputStreamForId(rId));
 
 OOXMLValue::Pointer_t aValue(new OOXMLInputStreamValue(xInputStream));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/iosremote

[Tor Lillqvist]

 ios/iosremote/iosremote.xcodeproj/project.pbxproj |4 
 1 file changed, 4 insertions(+)

New commits:
commit de3a561d6c927e849c1a7e46830310c272321d06
Author: Tor Lillqvist 
Date:   Mon Jun 10 11:24:41 2013 +0300

Needs the CoreImage framework

diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj 
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 78103fa..7fa842c 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -27,6 +27,7 @@
57C6E42F175E076900E8BC5F /* CommunicationManager.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 57C6E429175E076900E8BC5F /* 
CommunicationManager.m */; };
57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 57C6E42B175E076900E8BC5F /* 
CommandInterpreter.m */; };
57C6E431175E076900E8BC5F /* Server.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 57C6E42D175E076900E8BC5F /* Server.m */; };
+   BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* 
CoreImage.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -63,6 +64,7 @@
57C6E42B175E076900E8BC5F /* CommandInterpreter.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CommandInterpreter.m; sourceTree = ""; };
57C6E42C175E076900E8BC5F /* Server.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
Server.h; sourceTree = ""; };
57C6E42D175E076900E8BC5F /* Server.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= Server.m; sourceTree = ""; };
+   BE9EBD061765BF0800283FD2 /* CoreImage.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; 
sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -70,6 +72,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+   BE9EBD071765BF0800283FD2 /* CoreImage.framework 
in Frameworks */,
57C6E3F3175E06E800E8BC5F /* UIKit.framework in 
Frameworks */,
57C6E3F5175E06E800E8BC5F /* 
Foundation.framework in Frameworks */,
57C6E3F7175E06E800E8BC5F /* 
CoreGraphics.framework in Frameworks */,
@@ -82,6 +85,7 @@
57C6E3E6175E06E800E8BC5F = {
isa = PBXGroup;
children = (
+   BE9EBD061765BF0800283FD2 /* CoreImage.framework 
*/,
57B152971764703500EECC67 /* Base64.h */,
57B152981764703500EECC67 /* Base64.m */,
57C6E425175E076900E8BC5F /* Communication */,
___
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' - 8b/87a60b681b4768d04e7a980c0d96e106a2f84a

[Caolán McNamara]

 8b/87a60b681b4768d04e7a980c0d96e106a2f84a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 48e7c8e73bf0aed46323a9c8f9f324800736bb56
Author: Caolán McNamara 
Date:   Mon Jun 10 09:24:19 2013 +0100

Notes added by 'git notes add'

diff --git a/8b/87a60b681b4768d04e7a980c0d96e106a2f84a 
b/8b/87a60b681b4768d04e7a980c0d96e106a2f84a
new file mode 100644
index 000..463d75e
--- /dev/null
+++ b/8b/87a60b681b4768d04e7a980c0d96e106a2f84a
@@ -0,0 +1 @@
+prefer: 1d1d1b463dd324437f7dcadbcf8f69377ff3fede
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC weekly update] iOS remote control

[Tor Lillqvist]

>
>
> I faced this problem too and used boost :)
>
>
I don't think we want to drag in boost in an otherwise clean Objective-C
-only app. (Cédric's code at least includes a boost header, too.)

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

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

[Miklos Vajna]

 writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf |   10 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 2 files changed, 11 insertions(+)

New commits:
commit 0cdb92107647d1e1571675b21d421d618ad90c35
Author: Miklos Vajna 
Date:   Mon Jun 10 09:43:01 2013 +0200

fdo#64656 RTF import: handle levelnumbers without leveltext

Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
(cherry picked from commit 2c64af529567324f4433984ed7673304d26062c8)

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
new file mode 100644
index 000..1c815c4
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
@@ -0,0 +1,10 @@
+{\rtf
+{\*\listtable 
+{\list \listtemplateid3794224 \listhybrid 
+{\listlevel \levelnfc0 \levelnfcn0 \leveljc0 \leveljcn0 \levelstartat1 
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0 
+{\levelnumbers ;}
+}
+{\listname ;}
+\listid258183 }
+}
+}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fcd0ef5..5c44b25 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3839,6 +3839,7 @@ int RTFDocumentImpl::popState()
 }
 break;
 case DESTINATION_LEVELNUMBERS:
+if (aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText))
 {
 RTFSprms& rAttributes = 
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)->getAttributes();
 RTFValue::Pointer_t pValue = 
rAttributes.find(NS_ooxml::LN_CT_LevelText_val);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO / Firebird DB Integration

[Andres Gomez]

Hi,

sorry for the delayed answer on this.

On Tue, 2013-05-28 at 19:48 +0100, Andrzej J. R. Hunt wrote:
...
> I'd be interested to know what your views are on this / which version
> you've been using so far? I guess the LO developers in general might
> also have some input on which is preferable?
...

With the constraints we saw to start using FB3 and its native C++ API
straight away, we chose to go for FB2.5 and the native plain C API.

I think this is a safer path and migrating to native C++ and FB3 once it
is stable shouldn't be hard in the future.

...
> Also have any of you looked at integrating Firebird into the LO build
> system yet, as this was one of the first things I was planning on doing
> (although that is dependent on the choice of FB 2.5 vs 3). I think
> Andres mentioned he was concentrating on developing on Linux at first --
> I could look into the Windows specifics for Firebird to ensure things
> are as cross-platform as possible from the start (although I should
> probably mention I don't have too much Windows experience yet, and my
> system isn't the fastest for building stuff there).
...

I started doing it for Linux as an external dependency. I also started
walking the path to add FB as a bundled library inside LibO, but this is
far from being completed.

In any case, any help on Windows is welcome :)

Javier is the one leading the development effort of the SDBC driver. I
think he was saying that he could now split tasks to be done regarding
this.

...
> I've create a wiki page where I'm putting down some notes on whats
> happening here -- I've also extracted the technical discussion and the
> estimated timeplan from my GSOC application in case that's useful to
> anyone else:
> https://wiki.documentfoundation.org/Development/Base/FirebirdSQL . Feel
> free to add to/edit that if you wish.
...

I've updated it with the latest information I had.

Br.
-- 
Andres Gomez
Computer Science Engineer
mailto:ago...@igalia.com
http://blogs.igalia.com/agomez/category/igaliacom/
IGALIA, S.L. http://www.igalia.com


signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: new crash import test run with results based on current master

[Miklos Vajna]

On Sun, Jun 09, 2013 at 11:34:32AM +0200, Markus Mohrhard 
 wrote:
> Crash:/devel/files/rtf/fdo64656-79370.rtf through disposed

This is fixed now in master.


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

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

[Miklos Vajna]

 writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf |   10 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 2 files changed, 11 insertions(+)

New commits:
commit 2c64af529567324f4433984ed7673304d26062c8
Author: Miklos Vajna 
Date:   Mon Jun 10 09:43:01 2013 +0200

fdo#64656 RTF import: handle levelnumbers without leveltext

Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
new file mode 100644
index 000..1c815c4
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/fdo64656.rtf
@@ -0,0 +1,10 @@
+{\rtf
+{\*\listtable 
+{\list \listtemplateid3794224 \listhybrid 
+{\listlevel \levelnfc0 \levelnfcn0 \leveljc0 \leveljcn0 \levelstartat1 
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0 
+{\levelnumbers ;}
+}
+{\listname ;}
+\listid258183 }
+}
+}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 345912d..b2179c4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3843,6 +3843,7 @@ int RTFDocumentImpl::popState()
 }
 break;
 case DESTINATION_LEVELNUMBERS:
+if (aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText))
 {
 RTFSprms& rAttributes = 
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)->getAttributes();
 RTFValue::Pointer_t pValue = 
rAttributes.find(NS_ooxml::LN_CT_LevelText_val);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/CustomTarget_localedata.mk

[Stephan Bergmann]

 i18npool/CustomTarget_localedata.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f4856a861275fe40f9b8fcb5164e2c4a97faef7
Author: Stephan Bergmann 
Date:   Mon Jun 10 09:42:53 2013 +0200

One more gbuild $ -> $$ fix

Change-Id: I516c6bde68e8ee269fe4e392f96e251b556e21bd

diff --git a/i18npool/CustomTarget_localedata.mk 
b/i18npool/CustomTarget_localedata.mk
index f10769f..9ff1600 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -21,7 +21,7 @@ $(call 
gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
| $(call gb_Executable_get_runtime_dependencies,saxparser)
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
$$(call gb_Helper_abbreviate_dirs, \
-   $(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
+   $$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
-env:LO_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target_for_build,saxparser)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC weekly update] iOS remote control

[Tor Lillqvist]

>
>
> One last question: in order to do base64 decoding for the preview images,
> I've used a base64 decoder which is under Public Domain License. Can we
> include this kind of license in LibreOffice? I've reproduced the license
> below.
>


> //  Created by Kiichi Takeuchi on 4/20/10.
>
> //  Copyright 2010 ObjectGraph LLC. All rights reserved.
>
> //
>
> // Original Source Code is donated by Cyrus
>
> // Public Domain License
>
> // http://www.cocoadev.com/index.pl?BaseSixtyFour
>
>
Hmm, what is the temporal relationship of these lines? Was the code
originally put in the public domain by "Cyrus" (whatever/whoever that is),
and then adopted and modified by Kiichi Takeuchi (working for this
ObjectGraph LLC?)? In that case, I don't see anything from
Takeuchi/ObjectGraph that would make their modified version public domain,
too. IMHO best to avoid such unclearly licensed code completely.

Surely there must be base64 decoding code out there that has clearer
licensing.

And what is the point in this code with the use of an Objective-C class
that has only class methods anyway, and instances of that class are
meaningless? Is that considered good Objective-C practice? (I don't know;
maybe it is?) http://stackoverflow.com/a/3516922/259398 seems to say that
is not good practice. But other places seem to say that it is OK.

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

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

[Matthias Freund]

 sw/source/ui/uiview/scroll.cxx  |   16 +--
 sw/source/ui/uiview/srcview.cxx |   30 +++
 sw/source/ui/uiview/swcli.cxx   |   32 +++
 sw/source/ui/uiview/view.cxx|  163 ++--
 sw/source/ui/uiview/view.hrc|   10 +-
 5 files changed, 115 insertions(+), 136 deletions(-)

New commits:
commit de34ef765f72754137f4b7216d22de8a7fac2f6a
Author: Matthias Freund 
Date:   Sat Jun 8 00:37:22 2013 +0200

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

Translations and cleanups.

Change-Id: I1894cf896ebfcbbad16323f620c0e986670279d1
Reviewed-on: https://gerrit.libreoffice.org/4192
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index 0bb2ee2..6a1ef23 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -41,10 +41,8 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
 
  SwScrollbar::~SwScrollbar() {}
 
-/*
- Beschreibung:  wird nach einer Aenderung der Dokumentgroesse gerufen, um den
-Range des Scrollbars neu einzustellen.
-*/
+// Will be called after a change of the document size
+// to refresh the range of the scrollbars.
 
 void SwScrollbar::DocSzChgd( const Size &rSize )
 {
@@ -55,11 +53,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize )
 SetPageSize( nVisSize * 77 / 100 );
 }
 
-/*
- Beschreibung:  wird nach einer Veraenderung des sichtbaren Ausschnittes
-gerufen.
-*/
-
+// Will be called after a change of the visible view section.
 
 void SwScrollbar::ViewPortChgd( const Rectangle &rRect )
 {
@@ -104,11 +98,11 @@ void SwScrollbar::SetAuto(sal_Bool bSet)
 {
 bAuto = bSet;
 
-// automatisch versteckt - dann anzeigen
+// hide autmatically - automatisch versteckt - then show
 if(!bAuto && bVisible && !ScrollBar::IsVisible())
 ExtendedShow(sal_True);
 else if(bAuto)
-AutoShow(); // oder automatisch verstecken
+AutoShow(); // or hide automatically
 }
 }
 
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 53a856c..4092a2f 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -102,7 +102,7 @@ using ::com::sun::star::util::SearchOptions;
 
 #define SRC_SEARCHOPTIONS (0x & 
~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL))
 
-// Druckraender -> wie Basic - Ide
+// Printing margins -> like Basic - Ide
 #define LMARGPRN1700
 #define RMARGPRN 900
 #define TMARGPRN2000
@@ -143,7 +143,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, 
sal_uInt16 nPages, sal_uInt1
 
 long nFontHeight = rOutDev.GetTextHeight();
 
-// 1.Border => Strich, 2+3 Border = Freiraum.
+// 1.Border => Line, 2+3 Border = Space.
 long nYTop = TMARGPRN-3*nBorder-nFontHeight;
 
 long nXLeft = nLeftMargin-nBorder;
@@ -202,14 +202,14 @@ static void lcl_ConvertTabsToSpaces( String& rLine )
 {
 if ( rLine.GetChar(nPos) == '\t' )
 {
-// Nicht 4 Blanks, sondern an 4er TabPos:
+// Not 4 blanks, but on 4th TabPos:
 OUStringBuffer aBlanker;
 comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) 
), ' ');
 rLine.Erase( nPos, 1 );
 rLine.Insert(aBlanker.makeStringAndClear(), nPos);
 nMax = rLine.Len();
 }
-nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt...
+nPos++; // Not optimally, if tab, but not wrong...
 }
 }
 }
@@ -227,7 +227,7 @@ SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, 
SfxViewShell*) :
 SwSrcView::~SwSrcView()
 {
 SwDocShell* pDocShell = GetDocShell();
-OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Wieso keine WebDocShell?");
+OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
 const TextSelection&  rSel = aEditWin.GetTextView()->GetSelection();
 ((SwWebDocShell*)pDocShell)->SetSourcePara( static_cast< sal_uInt16 >( 
rSel.GetStart().GetPara() ) );
 
@@ -256,8 +256,8 @@ void SwSrcView::Init()
 SetName(OUString("Source"));
 SetWindow( &aEditWin );
 SwDocShell* pDocShell = GetDocShell();
-// wird das Doc noch geladen, dann muss die DocShell das Load
-// anwerfen, wenn das Laden abgeschlossen ist
+// If the doc is still loading, then the DocShell must fire up
+// the Load if the loading is completed.
 if(!pDocShell->IsLoading())
 Load(pDocShell);
 else
@@ -364,7 +364,7 @@ void SwSrcView::Execute(Sf