[Libreoffice-commits] core.git: 3 commits - animations/source dbaccess/source extensions/source offapi/com offapi/UnoApi_offapi.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.m

2013-04-24 Thread Noel Grandin 
 animations/source/animcore/animcore.cxx   |   18 --
 dbaccess/source/ui/browser/sbagrid.cxx|   20 +-
 extensions/source/propctrlr/controlfontdialog.cxx |   16 +
 extensions/source/propctrlr/controlfontdialog.hxx |5 +
 offapi/UnoApi_offapi.mk   |3 +
 offapi/com/sun/star/animations/ParallelTimeContainer.idl  |   37 
 offapi/com/sun/star/animations/XParallelTimeContainer.idl |   42 ++
 offapi/com/sun/star/form/ControlFontDialog.idl|   42 ++
 sd/CppunitTest_sd_filters_test.mk |1 
 sd/CppunitTest_sd_regression_test.mk  |1 
 sd/source/core/CustomAnimationEffect.cxx  |   14 +++-
 sd/source/core/sdpage_animations.cxx  |   16 ++---
 sd/source/ui/animations/CustomAnimationPane.cxx   |   22 +++
 sd/source/ui/unoidl/randomnode.cxx|   10 +--
 sd/source/ui/view/ViewShellBase.cxx   |1 
 15 files changed, 191 insertions(+), 57 deletions(-)

New commits:
commit 378c038918ca6c7adecf73f49e627c75ebd0e43a
Author: Noel Grandin 
Date:   Tue Apr 23 16:04:30 2013 +0200

fdo#46808 Convert animations::ParallelTimeContainer to new style

Change-Id: Iac6337828c807a132e561b5e9017a708be2e9729

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index a503097..5b83bc0 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -108,8 +109,8 @@ class AnimationNodeBase :   public XAnimateMotion,
 public XTransitionFilter,
 public XAnimateSet,
 public XAnimateTransform,
+public XParallelTimeContainer,
 public XIterateContainer,
-public XEnumerationAccess,
 public XServiceInfo,
 public XTypeProvider,
 public XAudio,
@@ -547,9 +548,9 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& 
aType ) throw (RuntimeEx
 aType,
 static_cast< XServiceInfo * >( this ),
 static_cast< XTypeProvider * >( this ),
-static_cast< XChild * >( static_cast< XTimeContainer * >(this) ),
+static_cast< XChild * >( static_cast< XTimeContainer * >( static_cast< 
XIterateContainer * >(this) ) ),
 static_cast< XCloneable* >( this ),
-static_cast< XAnimationNode* >( static_cast< XTimeContainer * >(this) 
),
+static_cast< XAnimationNode* >( static_cast< XTimeContainer * >( 
static_cast< XIterateContainer * >(this) ) ),
 static_cast< XInterface* >(static_cast< OWeakObject * >(this)),
 static_cast< XWeak* >(static_cast< OWeakObject * >(this)),
 static_cast< XChangesNotifier* >( this ),
@@ -560,17 +561,24 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& 
aType ) throw (RuntimeEx
 switch( mnNodeType )
 {
 case AnimationNodeType::PAR:
+aRet = ::cppu::queryInterface(
+aType,
+static_cast< XParallelTimeContainer * >( this ),
+static_cast< XTimeContainer * >( static_cast< 
XIterateContainer * >(this) ),
+static_cast< XEnumerationAccess * >( this ),
+static_cast< XElementAccess * >( this ) );
+break;
 case AnimationNodeType::SEQ:
 aRet = ::cppu::queryInterface(
 aType,
-static_cast< XTimeContainer * >( this ),
+static_cast< XTimeContainer * >( static_cast< 
XIterateContainer * >(this) ),
 static_cast< XEnumerationAccess * >( this ),
 static_cast< XElementAccess * >( this ) );
 break;
 case AnimationNodeType::ITERATE:
 aRet = ::cppu::queryInterface(
 aType,
-static_cast< XTimeContainer * >( this ),
+static_cast< XTimeContainer * >( static_cast< 
XIterateContainer * >(this) ),
 static_cast< XIterateContainer * >( this ),
 static_cast< XEnumerationAccess * >( this ),
 static_cast< XElementAccess * >( this ) );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 2099eba..ed72206 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -36,6 +36,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/accessibil
AccessBridge \
 ))
 $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\
+   ParallelTimeContainer \
SequenceTimeContainer \
TargetPropertiesCreator \
 ))
@@ -1647,6 +1648,7 @@ $(eval $(cal

hints asked for fdo#59727

2013-04-24 Thread Winfried Donkers 
Hi,

Bug fdo59727 is about addin function MONTHS() that is not interpreted correctly 
when read from an xlsx file.
That is, an xlsx file with the function "MONTHS(...)" opened with calc shows 
"com.sun.star.sheet.addin.datefunctions.getdiffmonths(...)" and understandably 
results to #NAME? .

The problem also occurs with function WEEKS, but not with OCT2HEX, so not with 
all addin functions. I have not tested with other addin functions.

Hints where to look for the cause are welcome.
I found maAddInMap in  /core/sc/source/core/tool/odffmap.cxx, but don't know 
where and how this map is used to convert to and from xlsx.
This area may be way out my comfort zone, so I'm not sure at all yet whether I 
want to be the assignee for this bug :-)



Winfried

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

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

2013-04-24 Thread Muthu Subramanian 
 cppcanvas/source/mtfrenderer/emfplus.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit abd0ed222788077b66d92b84f0918309aa58d865
Author: Muthu Subramanian 
Date:   Thu Apr 25 11:57:59 2013 +0530

n#812793: (Workaround) Transparent background import in EMF+.

EMF+ seems to have alpha of 0xff for transparent background!

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 81f7eb7..1ef38a6 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -890,10 +890,14 @@ namespace cppcanvas
 ActionSharedPtr pPolyAction;
 
 if (isColor) {
-EMFP_DEBUG (printf ("EMF+\t\tcolor fill\n"));
-
+EMFP_DEBUG (printf ("EMF+\t\tcolor fill:0x%X\n", 
brushIndexOrColor));
 rState.isFillColorSet = true;
 rState.isLineColorSet = false;
+// n#812793: EMF+ Seems to specify transparent background with 
Alpha=0xFF !
+// Workaround for the problem.
+if(brushIndexOrColor == 0x)
+brushIndexOrColor = 0xFF;
+
 SET_FILL_COLOR(brushIndexOrColor);
 
 pPolyAction = ActionSharedPtr ( 
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, 
rParms.mrCanvas, rState ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Muthu Subramanian 
 cppcanvas/source/mtfrenderer/emfplus.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4bc3ead0649bf2885050ec4cfb47a5ed13bfa41e
Author: Muthu Subramanian 
Date:   Thu Apr 25 11:57:59 2013 +0530

n#812793: (Workaround) Transparent background import in EMF+.

EMF+ seems to have alpha of 0xff for transparent background!

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 17ec217..bcc24f2 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -887,10 +887,14 @@ namespace cppcanvas
 ActionSharedPtr pPolyAction;
 
 if (isColor) {
-EMFP_DEBUG (printf ("EMF+\t\tcolor fill\n"));
-
+EMFP_DEBUG (printf ("EMF+\t\tcolor fill:0x%X\n", 
brushIndexOrColor));
 rState.isFillColorSet = true;
 rState.isLineColorSet = false;
+// n#812793: EMF+ Seems to specify transparent background with 
Alpha=0xFF !
+// Workaround for the problem.
+if(brushIndexOrColor == 0x)
+brushIndexOrColor = 0xFF;
+
 SET_FILL_COLOR(brushIndexOrColor);
 
 pPolyAction = ActionSharedPtr ( 
internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, 
rParms.mrCanvas, rState ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Muthu Subramanian 
 sfx2/source/doc/objstor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06b918053fb9cf455cf431ca001a63030092d018
Author: Muthu Subramanian 
Date:   Thu Apr 25 11:47:56 2013 +0530

Broken security/password when saving to older odf (sx?) formats.

nDefVersion is the default doc version, whereas, we need
to check the current document version in question.
While this changes just one of the places - a review is
probably required for other places as well, where
nDefVersion is used.

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a6fef76..b92a10a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -383,7 +383,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< 
embed::XStorage >& xSto
 aEncryptionAlgs[1].Value <<= 
xml::crypto::CipherID::BLOWFISH_CFB_8;
 aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA1_1K;
 
-if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
+if ( nVersion >= SOFFICE_FILEFORMAT_8 )
 {
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Tor Lillqvist 
 svx/source/gengal/gengal.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 427d20e72e914082af5cddc9527fb3df0dd270a2
Author: Tor Lillqvist 
Date:   Thu Apr 25 08:37:40 2013 +0300

Fix warning: unused variable 'assignment' [loplugin]

Change-Id: I0bf331044d8971cc39ee22b909649aecff1611c3

diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index cbb2fc2..b4ace29 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -163,7 +163,6 @@ void GalApp::Init()
 #endif
 OUString baseBinDir = fileName.copy( 0, lastSlash );
 OUString installPrefix = baseBinDir + OUString::createFromAscii( 
"/../.." );
-OUString assignment = OUString( "OOO_INSTALL_PREFIX=" ) + 
installPrefix;
 
 OUString envVar( "OOO_INSTALL_PREFIX");
 osl_setEnvironment(envVar.pData, installPrefix.pData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Kohei Yoshida 
 sc/inc/formulacell.hxx  |   11 +-
 sc/source/core/data/column3.cxx |   31 +--
 sc/source/core/data/formulacell.cxx |  150 +---
 3 files changed, 71 insertions(+), 121 deletions(-)

New commits:
commit eee877bcef42435ee99b2614ba9a0ab151703aa9
Author: Kohei Yoshida 
Date:   Wed Apr 24 21:43:06 2013 -0400

We really don't need to use similar data unless I missed something.

Change-Id: Iaab6033120c3d50a54fb151916dc2a7b7ba5a98c

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 469495a..3e68144 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -34,14 +34,12 @@ struct ScSimilarFormulaDelta;
 struct SC_DLLPUBLIC ScFormulaCellGroup
 {
 sal_Int32  mnRefCount;
-ScSimilarFormulaDelta *mpDelta;  // difference between items in column
 sal_Int32  mnStart;  // Start offset of that cell
 sal_Int32  mnLength; // How many of these do we have ?
+bool mbInvariant;
 
 ScFormulaCellGroup();
 ~ScFormulaCellGroup();
-
-bool IsCompatible( ScSimilarFormulaDelta *pDelta );
 };
 inline void intrusive_ptr_add_ref(ScFormulaCellGroup *p)
 {
@@ -100,6 +98,8 @@ private:
 
 public:
 
+enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
+
 #ifdef USE_MEMPOOL
 DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
 #endif
@@ -297,8 +297,9 @@ public:
 { return xGroup; }
 void   SetCellGroup( const ScFormulaCellGroupRef &xRef )
 { xGroup = xRef; }
-ScSimilarFormulaDelta *BuildDeltaTo( ScFormulaCell *pOther );
-void   ReleaseDelta( ScSimilarFormulaDelta *pDelta );
+
+CompareState CompareByTokenArray( ScFormulaCell *pOther ) const;
+
 bool   InterpretFormulaGroup();
 
 // nOnlyNames may be one or more of SC_LISTENING_NAMES_*
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3eb4b17..615fbaf 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2118,15 +2118,14 @@ void ScColumn::RebuildFormulaGroups()
 if ( rCur.pCell->GetCellType() != CELLTYPE_FORMULA )
 continue;
 
-// see if these formulae are similar
+// see if these formula tokens are identical.
 ScFormulaCell *pCur = static_cast< ScFormulaCell *>( rCur.pCell );
 ScFormulaCell *pPrev = static_cast< ScFormulaCell *>( rPrev.pCell );
 
-ScSimilarFormulaDelta *pDelta = pPrev->BuildDeltaTo( pCur );
-
-if ( !pDelta )
+ScFormulaCell::CompareState eCompState = 
pPrev->CompareByTokenArray(pCur);
+if (eCompState == ScFormulaCell::NotEqual)
 {
-// not similar
+// different formula tokens.
 pCur->SetCellGroup( xNone );
 continue;
 }
@@ -2136,8 +2135,8 @@ void ScColumn::RebuildFormulaGroups()
 {
 // create a new group ...
 xGroup.reset(new ScFormulaCellGroup);
-xGroup->mpDelta = pDelta;
 xGroup->mnStart = rPrev.nRow;
+xGroup->mbInvariant = eCompState == ScFormulaCell::EqualInvariant;
 xGroup->mnLength = 2;
 
 maFnGroups.push_back( xGroup );
@@ -2145,27 +2144,11 @@ void ScColumn::RebuildFormulaGroups()
 pCur->SetCellGroup( xGroup );
 pPrev->SetCellGroup( xGroup );
 }
-else if ( xGroup->IsCompatible( pDelta ) )
+else
 {
-// we are a compatible extension - extend the group
+// existing group. extend its length.
 pCur->SetCellGroup( xGroup );
 xGroup->mnLength++;
-pCur->ReleaseDelta( pDelta );
-}
-else
-{
-#if OSL_DEBUG_LEVEL > 1
-OUString aFormula;
-pCur->GetFormula( aFormula );
-ScAddress aAddr( nCol, rCur.nRow, nTab );
-OUString aCellAddr;
-aAddr.Format( aCellAddr, 0, pDocument );
-
-fprintf( stderr, "unusual incompatible extension in cell '%s' of 
formulae '%s'\n" ,
- OUStringToOString( aCellAddr, RTL_TEXTENCODING_UTF8 
).getStr(),
- OUStringToOString( aFormula, RTL_TEXTENCODING_UTF8 
).getStr() );
-#endif
-pCur->ReleaseDelta( pDelta );
 }
 }
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index ab70344..fe956f5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -376,7 +376,7 @@ void adjustDBRange(ScToken* pToken, ScDocument& rNewDoc, 
const ScDocument* pOldD
 }
 
 ScFormulaCellGroup::ScFormulaCellGroup() :
-mnRefCount(0), mpDelta(NULL), mnStart(0), mnLength(0)
+mnRefCount(0), mnStart(0), mnLength(0), mbInvariant(false)
 {
 }
 
@@ -2857,123 +2857,89 @@ void ScFormulaCell::CompileColRowNameFormula()
 }
 }
 
-// we really want to be a lot more descriptive than this
-struct S

Re: [GSoC] Enhanced database ranges, some clarification needed.

2013-04-24 Thread Kohei Yoshida 
On Tue, Apr 23, 2013 at 5:04 PM, Akash Shetye  wrote:

> Hey again,
>
> Thanks for the reply, it really helps to know and discuss the task before
> putting in a proposal. Sorry for the quick and dirty solution, well thats
> what came to my mind right away. :P. So here is what I gather so far:
>
> *Alternating colors in database ranges "**very similar to the Format as
> Table":
> *
>
>- Unlike MSExcel, LO has no support for Table entities. When 'Format
>as Table' is done on a bunch of data in excel, the selected data is now
>available as a 'Table' entity, having it's own specialized attributes like
>row headers, total row etc and it's syntax (check 
> this).
>
>
>  Actually LibreOffice does already have an equivalent concept called
'Range'. See from the menu Data -> Define Range. This task would involve
expanding that existing Range feature to support formatted table like
option etc.


>
> *New reference syntax in formula expressions:
> *
>
>- Currently I can enable the column label by selecting Data->Define
>Database Range ---> click "More" and tick the column headers checkbox.
>- We can address the entire range only currently thus =SUM(col_label)
>is valid and supported in LO, however addressing an individual cell or a
>range of cells within the range using col_label is not supported,
>implementing this is what the second part is about.
>
> Well, you can disregard that =SUM(col_label) thing since that has no
relation to the database range. In fact, I'm not sure if that's supposed to
work like that...  It appears to pick up *any* string cell value even
outside database ranges. This is very weird

Anyway, what needs to be implemented is to, given a table name and a column
label inside the table, allow formula to reference a range like
=SUM(TableName[ColLabel]), =TableName[[#Headers],[ColLabel]] and so on.

>
>- Later we could try to figure an appropriate syntax, it would be
>better to consult the devs and UX guys for that.
>
> We'll just use Excel's syntax. There is no need to reinvent the wheel
here. Doing anything different would unnecessarily introduce an
interoperability issue and there is no reason why we should use a different
syntax (rather than just being different). No UX involvement is needed
since this is just a basic formula syntax.

>
>-
>
> *Demonstrating some competency in the areas relevant to the project:*
>
>- I tried searching for bugs involving the mentioned areas, they seem
>hard to come by. Most of those involving ScDBData are more about .xls and
>open document incompatibilities.
>- Perhaps you could point me to a bug or throw some keywords at me
>which would lead me to it.
>- Meanwhile, I have found this 
> bug,
>it seems to be a little off our relevant area though.
>
> It doesn't have to be an easy hack. Technically you've already done an
easy hack, so you can just start reading the code around ScDBData, and make
some "interesting" change. I really don't care what the change is, as long
as you think the change should demonstrate your familiarity with the code,
and your competency with working with that area of the code.

Hope this helps.

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

Re: [Cygwin] [Master] failure when compiling liblangtag

2013-04-24 Thread Mat M 

Hi Eike & Peter

Le Tue, 16 Apr 2013 15:44:28 +0200, Eike Rathke  a écrit:


Hi Mat,

Cc'ing Peter Foley who did the gcc-wrapper.

On Friday, 2013-04-12 23:49:16 +0200, Mat M wrote:


Command is :
C:\cygwin\opt\lo\bin\ccache.exe cl.exe -nologo -EHsc -MD -Gy
-Zc:wchar_t- -Ob1 -Oxs -Oy- -DHAVE_CONFIG_H -I. -I..
-I../liblangtag/ -I.. -I../liblangtag/ -I.. -D__LANGTAG_COMPILATION  
-DBUILDDIR=\"/cygdrive/d/src/libo/workdir/wntmsci13.pro/UnpackedTarball/langtag\"  
-DSRCDIR=\"/cygdrive/d/src/libo/workdir/wntmsci13.pro/UnpackedTarball/langtag\"

-DREGDATADIR=\"/usr/local/share/liblangtag\"
-DLANGTAG_EXT_MODULE_PATH=\"/usr/local/lib/liblangtag\"
-ID:/src/libo/workdir/wntmsci13.pro/UnpackedTarball/xml2/include
-DG_LOG_DOMAIN=\"LangTag\" -Zi -c -showIncludes lt-database.c

So SRCDIR stops at langtag, but lt-database.c is in liblangtag, but
we also see make entering liblangtag subdir. The langtag Makefile
needs a fix ?


The SRCDIR looks correct, SRCDIR here specifies the top directory where
the entire source package is located, not it's various subdirectories.

Does the wrapper actually execute the command in that then current
subdirectory?


I added an output of the CWD and get:
PWD= D:\src\libo\workdir\wntmsci14.pro\UnpackedTarball\langtag\liblangtag
CMD= C:\cygwin\opt\lo\bin\ccache.exe cl.exe -nologo -EHsc -MD -Gy
-Zc:wchar_t- -Ob1 -Oxs -Oy- -DHAVE_CONFIG_H -I. -I.. -I../liblangtag/ -I..
-I../liblangtag/ -I.. -D__LANGTAG_COMPILATION
-DBUILDDIR=\"/cygdrive/d/src/libo/workdir/wntmsci14.pro/UnpackedTarball/langtag\"
-DSRCDIR=\"/cygdrive/d/src/libo/workdir/wntmsci14.pro/UnpackedTarball/langtag\"
-DREGDATADIR=\"/usr/local/share/liblangtag\"
-DLANGTAG_EXT_MODULE_PATH=\"/usr/local/lib/liblangtag\"
-ID:/src/libo/workdir/wntmsci14.pro/UnpackedTarball/xml2/include
-DG_LOG_DOMAIN=\"LangTag\" -Zi -c -showIncludes lt-database.c
cl : Command line error D8003 : missing source filename


When I go to the directory, set the PATH according to the one from
config_host.mk, I get :

mm@FAUCON
/cygdrive/d/src/libo/workdir/wntmsci14.pro/UnpackedTarball/langtag/liblangtag
$ /cygdrive/c/PROGRA~2/MICROS~1.0/VC/bin/cl.exe  -nologo -EHsc -MD -Gy
-Zc:wchar_t- -Ob1 -Oxs -Oy- -DHAVE_CONFIG_H -I. -I.. -I../liblangtag/ -I..
-I../liblangtag/ -I.. -D__LANGTAG_COMPILATION
-DBUILDDIR=\"/cygdrive/d/src/libo/workdir/wntmsci14.pro/UnpackedTarball/langtag\"
-DSRCDIR=\"/cygdrive/d/src/libo/workdir/wntmsci14.pro/UnpackedTarball/langtag\"
-DREGDATADIR=\"/usr/local/share/liblangtag\"
-DLANGTAG_EXT_MODULE_PATH=\"/usr/local/lib/liblangtag\"
-ID:/src/libo/workdir/wntmsci14.pro/UnpackedTarball/xml2/include
-DG_LOG_DOMAIN=\"LangTag\" -Zi -c -showIncludes lt-database.c
lt-database.c
Note: including file:
D:\src\libo\workdir\wntmsci14.pro\UnpackedTarball\langtag\config.h
lt-database.c(17) : fatal error C1083: Cannot open include file:
'string.h': No such file or directory

Which is a different error.
I get the D8003 when I try to run that in another directory, which makes
me think that although getcwd retrieves the current dir, it may not be the
one use as for launching the command. But CreateProcess should use the
same since the parameter is set to NULL [1].
SO really no clue there.



This error

cl : Command line error D8003 : missing source filename

is not accidentally caused by the -c option being followed by the
-showIncludes option?


Nope. I tried both to remove any doubt.


However, what also looks suspicious to me is that the renaming of the
object file does not occur anywhere on that command line, apparently the
target should be


  CC liblangtag_la-lt-database.lo
make[6]: *** [liblangtag_la-lt-database.lo] Error 1


so there should be some -o option followed by the output filename if I'm
not mistaken.

And, last but not least, why does this fail only for Mat?


My tree is on  29dcdf6b56f8dbc1b7d, and I did a git clean -fxd before make.



Seeing wntmsci13.pro in the workdir path suggests this is MSVC 2010,
correct? Maybe that simply works different..

Well, as we tend to support VS 2008, 2010 & 2012 in build setup, we should
have them also supported in gcc-wrapper.
BTW, moved to VS2012 no-express meanwhile

[1]
http://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx
--
Mat M
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-04-24 Thread Peter Foley 
 solenv/gbuild/LinkTarget.mk|5 -
 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1c0ebe9e0057e6900274f223ff604ee6212e363f
Author: Peter Foley 
Date:   Wed Apr 24 20:23:24 2013 -0400

fixes for libmerged

Change-Id: I77c7ebcbba4fd2c78d66d6088bbbf4a3122f7c8a

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 35896fe..b2fb19c 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -454,7 +454,9 @@ $(call gb_LinkTarget_get_target,Library/%.exports) : 
$(gb_Library_OUTDIRLOCATION
 $(call gb_LinkTarget_get_target,%) : $(call 
gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
$(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call 
gb_Library_get_linktargetname,$(lib,\
$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\
-   $(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid 
> $@),$(call gb_LinkTarget__command,$@,$*))
+   $(call gb_LinkTarget__command,$@,$*),\
+   mkdir -p $(dir $@) && echo invalid > $@ \
+   $(if $(SOVERSION),&& echo invalid > $@.$(SOVERSION))),$(call 
gb_LinkTarget__command,$@,$*))
$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -870,6 +872,7 @@ gb_BUILD_HELPER_LIBS := basegfx \
 
 gb_BUILD_HELPER_TOOLS := cppumaker \
idlc \
+   reg2unoidl \
regmerge \
rsc \
svidl
commit c06c0517c15225357f59ae828f6b18990906ae19
Author: Peter Foley 
Date:   Wed Apr 24 20:22:54 2013 -0400

libpython.so is now in instdir

Change-Id: Ib1b1a853d265a28bfab19c0fa25b778fcec92ba6

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index e6c2ee6..47f7191 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -187,7 +187,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib"
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTDIR)/program"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MPLv2/LGPLv3+ license statement

2013-04-24 Thread Ota Chasák 
All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

 

 

Ota Chasák

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

[Libreoffice-commits] core.git: 6 commits - i18nlangtag/source i18npool/Library_i18npool.mk i18npool/source include/i18nlangtag lotuswordpro/source

2013-04-24 Thread Eike Rathke 
 i18nlangtag/source/languagetag/languagetagicu.cxx   |   11 +++
 i18npool/Library_i18npool.mk|1 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |7 +-
 i18npool/source/collator/collator_unicode.cxx   |9 +--
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |   15 ++---
 include/i18nlangtag/languagetagicu.hxx  |   12 
 lotuswordpro/source/filter/lwptools.cxx |   45 
 7 files changed, 37 insertions(+), 63 deletions(-)

New commits:
commit 86acfb46ceb8946c6029811592d93041936e0091
Author: Eike Rathke 
Date:   Thu Apr 25 00:00:07 2013 +0200

removed commented out code that wouldn't be correct anyway

Change-Id: I1fc5f6b7e779ae0c9ac5f30934c2c5d75757581d

diff --git a/lotuswordpro/source/filter/lwptools.cxx 
b/lotuswordpro/source/filter/lwptools.cxx
index 9ef4ec5..77eb3dc 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -262,29 +262,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool 
bLongFormat)
 style = icu::DateFormat::FULL;//system full date format
 else
 style = icu::DateFormat::SHORT;//system short date format
-/*  ::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-strLang = strLang + A2OUSTR("_");
-OUString strLocale = strLang + strCountry;
 
-int32_t nLength = 0;
-int32_t nLengthNeed;
-UErrorCode status = U_ZERO_ERROR;
-UChar* pattern = NULL;
-
-UDateFormat* fmt= udat_open(UDAT_FULL, UDAT_FULL,
-
(char*)(OUStringToOString(strLocale,RTL_TEXTENCODING_MS_1252).getStr()), NULL, 
0, NULL, 0, &status);
-
-nLengthNeed = udat_toPattern(fmt,true,NULL,nLength,&status);
-if (status == U_BUFFER_OVERFLOW_ERROR)
-{
-status = U_ZERO_ERROR;
-nLength = nLengthNeed +1;
-pattern = (UChar*)malloc(sizeof(UChar)*nLength);
-udat_toPattern(fmt,true,pattern,nLength,&status);
-}
-*/
 //1 get locale for system
 icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
@@ -671,29 +649,6 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool 
bLongFormat)
 */
 XFTimeStyle* LwpTools::GetSystemTimeStyle()
 {
-/*  ::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-strLang = strLang + A2OUSTR("_");
-OUString strLocale = strLang + strCountry;
-
-int32_t nLength = 0;
-int32_t nLengthNeed;
-UErrorCode status = U_ZERO_ERROR;
-UChar* pattern = NULL;
-
-UDateFormat* fmt= udat_open(UDAT_FULL, UDAT_FULL,
-
(char*)(OUStringToOString(strLocale,RTL_TEXTENCODING_MS_1252).getStr()), NULL, 
0, NULL, 0, &status);
-
-nLengthNeed = udat_toPattern(fmt,true,NULL,nLength,&status);
-if (status == U_BUFFER_OVERFLOW_ERROR)
-{
-status = U_ZERO_ERROR;
-nLength = nLengthNeed +1;
-pattern = (UChar*)malloc(sizeof(UChar)*nLength);
-udat_toPattern(fmt,true,pattern,nLength,&status);
-}
-*/
 //1 get locale for system
 icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
commit f62a00f32a1adb4052b05e406cb0e040c7f2360d
Author: Eike Rathke 
Date:   Wed Apr 24 23:55:28 2013 +0200

can we stick a with our naming conventions, just a little bit?

Change-Id: I1457c64162c2aeb083e98a28737991ae6d0eee2e

diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 953c886..f9491b2 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -66,19 +66,19 @@ namespace
  * than english ones, ICU 4.2+ has to be used.
  */
 uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 
nNumber,
-const lang::Locale &aLocale ) throw( RuntimeException )
+const lang::Locale &rLocale ) throw( RuntimeException )
 {
 uno::Sequence< OUString > retValue;
 
 // Get the value from ICU
 UErrorCode nCode = U_ZERO_ERROR;
-const icu::Locale rIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
aLocale)));
+const icu::Locale aIcuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( 
rLocale)));
 
-icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale, 
nCode);
+icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, aIcuLocale, 
nCode);
 if (!U_SUCCESS(nCode))
 return retValue;
 
-boost::scoped_ptr 
xNumberFormat(icu::NumberFormat::createInstance(rIcuLocale, nCode));
+boost::scoped_ptr 
xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
 if (!U_SUCCESS(nCode))
 return retVal

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

2013-04-24 Thread Lionel Elie Mamane 
New branch 'feature/mariadb' available with the following commits:
commit d6c99cfee06e2788833193feb32c546dfe578a51
Author: Lionel Elie Mamane 
Date:   Wed Apr 24 23:47:58 2013 +0200

import driver Skleleton from SDK examples into mariadb driver

Integrate in LibreOffice's build infrastructure

Change-Id: I07efc7f9d7a8b6172950b74b06b33029f8a1e9a1

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

[PUSHED] fdo#61503 fix cli_cppuhelper bootstrap error

2013-04-24 Thread Peter Foley (via Code Review) 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3600

Approvals:
  Peter Foley: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I777d2d866cfc8b2363b418fd5cba6576e3a2b8ec
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 
Gerrit-Reviewer: Peter Foley 

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

[PATCH] fdo#61503 fix cli_cppuhelper bootstrap error

2013-04-24 Thread Peter Foley (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3600

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/3600/1

fdo#61503 fix cli_cppuhelper bootstrap error

Change-Id: I777d2d866cfc8b2363b418fd5cba6576e3a2b8ec
---
M cli_ure/source/native/native_share.h
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/cli_ure/source/native/native_share.h 
b/cli_ure/source/native/native_share.h
index 3c37f6c..700577f 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -62,7 +62,7 @@
 intptr_t intptr =
 reinterpret_cast< intptr_t >(
 mapping.mapInterface( x.get(), ::getCppuType( &x ) ) );
-::System::Runtime::InteropServices::GCHandle ^ handle = 
(::System::Runtime::InteropServices::GCHandle ^)(gcnew 
::System::IntPtr(intptr));
+::System::Runtime::InteropServices::GCHandle ^ handle = 
::System::Runtime::InteropServices::GCHandle::FromIntPtr(gcnew 
::System::IntPtr(intptr));
 ::System::Object ^ ret = handle->Target;
 handle->Free();
 return ret;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I777d2d866cfc8b2363b418fd5cba6576e3a2b8ec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 

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

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

2013-04-24 Thread Peter Foley 
 cli_ure/source/native/native_share.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe4ffd81045144ffb8d69ae9e5df7ef191005128
Author: Peter Foley 
Date:   Wed Apr 24 17:31:42 2013 -0400

fdo#61503 fix cli_cppuhelper bootstrap error

Change-Id: I777d2d866cfc8b2363b418fd5cba6576e3a2b8ec
Reviewed-on: https://gerrit.libreoffice.org/3600
Reviewed-by: Peter Foley 
Tested-by: Peter Foley 

diff --git a/cli_ure/source/native/native_share.h 
b/cli_ure/source/native/native_share.h
index 3c37f6c..700577f 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -62,7 +62,7 @@ inline ::System::Object ^ to_cli(
 intptr_t intptr =
 reinterpret_cast< intptr_t >(
 mapping.mapInterface( x.get(), ::getCppuType( &x ) ) );
-::System::Runtime::InteropServices::GCHandle ^ handle = 
(::System::Runtime::InteropServices::GCHandle ^)(gcnew 
::System::IntPtr(intptr));
+::System::Runtime::InteropServices::GCHandle ^ handle = 
::System::Runtime::InteropServices::GCHandle::FromIntPtr(gcnew 
::System::IntPtr(intptr));
 ::System::Object ^ ret = handle->Target;
 handle->Free();
 return ret;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryModule_host.mk

2013-04-24 Thread Peter Foley 
 RepositoryModule_host.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d3ea57d8261d193a18f2485b49badf0a3d5d2fda
Author: Peter Foley 
Date:   Wed Apr 24 17:30:37 2013 -0400

remove non-existant module

Change-Id: I7c4e2c9635f52f682595d95fca8a5f200a1074de

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e504cdc..1b939f1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
hwpfilter \
$(call gb_Helper_optional,HYPHEN,hyphen) \
i18nlangtag \
-   i18nlangtagicu \
i18npool \
i18nutil \
$(call gb_Helper_optional,ICU,icu) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - i18nlangtag/Library_i18nlangtagicu.mk i18nlangtag/Module_i18nlangtag.mk i18nlangtag/source include/i18nlangtag Library_merged.mk lotuswordpro/Library_lwpft.

2013-04-24 Thread Eike Rathke 
 Library_merged.mk |1 
 Repository.mk |1 
 RepositoryModule_host.mk  |1 
 i18nlangtag/Library_i18nlangtagicu.mk |   32 
 i18nlangtag/Module_i18nlangtag.mk |1 
 i18nlangtag/source/languagetag/languagetagicu.cxx |   36 ++
 include/i18nlangtag/languagetag.hxx   |1 
 include/i18nlangtag/languagetagicu.hxx|   44 ++
 lotuswordpro/Library_lwpft.mk |1 
 lotuswordpro/source/filter/lwptools.cxx   |   21 +++---
 10 files changed, 124 insertions(+), 15 deletions(-)

New commits:
commit 56e753aa6a762337ec09bd30445ad4b75c3bf5fe
Author: Eike Rathke 
Date:   Wed Apr 24 23:07:13 2013 +0200

use LanguageTagIcu

Change-Id: I048d72c0cd633e3aa9e6a74e4f111703969b1d77

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index f01261d..7673eb3 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\
 cppuhelper \
 sal \
i18nlangtag \
+   i18nlangtagicu \
 sfx \
 sot \
 svt \
diff --git a/lotuswordpro/source/filter/lwptools.cxx 
b/lotuswordpro/source/filter/lwptools.cxx
index dd723cc..9ef4ec5 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
@@ -284,15 +285,10 @@ XFDateStyle* LwpTools::GetSystemDateStyle(sal_Bool 
bLongFormat)
 udat_toPattern(fmt,true,pattern,nLength,&status);
 }
 */
-/* FIXME-BCP47: handle language tags! */
 //1 get locale for system
-::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLanguageTag().getLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-icu::Locale 
bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
-
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
+icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
-icu::DateFormat* fmt = icu::DateFormat::createDateInstance(style,bLocale);
+icu::DateFormat* fmt = icu::DateFormat::createDateInstance(style,aLocale);
 
 int32_t nLength = 0;
 int32_t nLengthNeed;
@@ -698,16 +694,11 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
 udat_toPattern(fmt,true,pattern,nLength,&status);
 }
 */
-/* FIXME-BCP47: handle language tags! */
 //1 get locale for system
-::com::sun::star::lang::Locale 
aLocale=Application::GetSettings().GetLanguageTag().getLocale();
-OUString strLang = aLocale.Language;
-OUString strCountry = aLocale.Country;
-icu::Locale 
bLocale((char*)(OUStringToOString(strLang,RTL_TEXTENCODING_MS_1252).getStr()),
-
(char*)(OUStringToOString(strCountry,RTL_TEXTENCODING_MS_1252).getStr()));
-
-icu::DateFormat* fmt = 
icu::DateFormat::createTimeInstance(icu::DateFormat::DEFAULT,bLocale);
+icu::Locale aLocale( LanguageTagIcu::getIcuLocale( 
Application::GetSettings().GetLanguageTag()));
 //2 get icu format pattern by locale
+icu::DateFormat* fmt = 
icu::DateFormat::createTimeInstance(icu::DateFormat::DEFAULT,aLocale);
+
 int32_t nLength = 0;
 int32_t nLengthNeed;
 UErrorCode status = U_ZERO_ERROR;
commit 095f3dde425eb79da0e7fbfe40e18de1ac4f368b
Author: Eike Rathke 
Date:   Wed Apr 24 22:55:43 2013 +0200

introduced libi18nlangtagicu

Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb

diff --git a/Library_merged.mk b/Library_merged.mk
index 2d5ef60..4603bda 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
+   i18nlangtagicu \
$(if $(filter TRUE,$(SOLAR_JAVA)), \
jvmaccess \
jvmfwk) \
diff --git a/Repository.mk b/Repository.mk
index 054d9a3..c4858b7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -469,6 +469,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
deployment \
fileacc \
i18nlangtag \
+   i18nlangtagicu \
i18nutil \
mcnttype \
package2 \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1b939f1..e504cdc 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
hwpfilter \
$(call gb_Helper_optional,HYPHEN,hyphen) \
i18nlangtag \
+   i18nlangtagicu \
i18npool \
i18nutil \
$(call gb_Helper_optional,ICU,icu) \
diff --git a/i18nlangtag/Library_i18nlangtagicu.mk 
b/i1

[ABANDONED] Patch fdo#60265 - Document converter wizard fails to find po...

2013-04-24 Thread Thorsten Behrens (via Code Review) 
Thorsten Behrens has abandoned this change.

Change subject: Patch fdo#60265 - Document converter wizard fails to find 
powerpoint files to convert
..


Patch Set 2: Abandoned

Superseded by 3598

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: If6667f2fb59902af64307b2510bed0e757ab2acd
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Anurag Kanungo 
Gerrit-Reviewer: Thorsten Behrens 

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

[Libreoffice-commits] core.git: soltools/mkdepend

2013-04-24 Thread Stephan Bergmann 
 soltools/mkdepend/pr.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6681432e39228deb982105caa8de2319c2084a08
Author: Stephan Bergmann 
Date:   Wed Apr 24 22:51:26 2013 +0200

error: too many arguments in call to 'pr_dummy' [-Werror]

Change-Id: Ib03b6d3af9909c971245314bbde2085d8c3c73b2

diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index e620078..6ebb01a 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -96,7 +96,7 @@ void recursive_pr_dummy(head, file)
 return;
 head->i_marked = 2; // it's a large boolean...
 if (head->i_file != file)
-pr_dummy(head, file);
+pr_dummy(head);
 for (i=0; ii_listlen; i++)
 recursive_pr_dummy(head->i_list[ i ], file);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Streamlining & Improving Triage Efforts

2013-04-24 Thread Joel Madero 
Hi All!

So I'm trying to streamline and improve triaging efforts (again...I know).
The idea is that some bugs should be getting higher priority for triaging
in order to catch bad ones faster and prevent regressions from sticking
around longer than need be. With this said I've made a short table with
what I see as a good prioritization set, I want to move this to a wiki but
first want input from anyone/everyone, if I'm missing something, should
condense, etc...

These lists (at least priority 1-4) become much more manageable than
staring at 1500+ unconfirmed bugs. Especially 1-3 should be getting triaged
quickly (preferably < 7 days). This is all in an attempt to get all bugs
triaged successfully within 30 days of report - we're a long ways off but
slowly can get there.

If the list isn't legible to you (it's a table copy/paste) please let me
know and I'll email you a document directly.

 Priority  Summary  Rationale/Description  FDO Link  Additional Information

1

Bibisecting bibisectrequest (Linux Only)

If a bisect is being requested it’s likely that this will get a regression
fixed much faster and be a lot of help for developers

*http://tinyurl.com/apk9q2j*



*UNCONFIRMED, NEW, REOPENED, ASSIGNED*

2

Minor Release Regressions (Version 3.6)

Recently a conversation on ESC made it clear that triaging minor release
regressions is quite important for two reasons:



Determine if it’s actually a regression for minor release (vs. .0 release)



Minor releases should always be leading to additional stability of release
(vs. .0 which usually comes with a lot of new features with potential
problems)

*http://tinyurl.com/b9omdfh*



Only UNCONFIRMED

 TODO: Create new wiki describing what to do with these when triaging,
additional steps required



*Will need updated per minor release*

3

Minor Release Regressions (Version 4)

Same rationale as above but version 4 – slightly lower priority since
version 3 is still officially recommended

*http://tinyurl.com/bkl3b2b*



Only UNCONFIRMED

 TODO: Create new wiki describing what to do with these when triaging,
additional steps required



*Will need updated per minor release*

4

All Other Regressions

Any other bug listed as a regression should be handled next.

*http://tinyurl.com/b9f9csr*

* *

*(this is just a link to all bugs marked regression, including the bugs in
the previous three links)*

Only UNCONFIRMED



TODO: Create new wiki describing what to do with these when triaging,
additional steps required

5

Non-Regression Version 4 Bugs

Bugs listed against 4 should be prioritized above version 3 bugs for a few
reasons:



   1. We can verify that it’s indeed only a version 4 bug, quite often the
   bug existed in 3 and version field should be updated
   2. As we move forward we know version 4 will soon become the recommended
   version and thus gets a bit more attention
   3. Keeping on track with <30 days untriaged – although we have a huge
   backlog, we should attempt to make it so no Version 4 bug report is left
   untouched for more than 30 days

 *http://tinyurl.com/bjjz3ho*

* *

*(this is all version 4 bugs including regressions)*

Only UNCONFIRMED



TODO: Clarify ideally what we should do with these on bug triage page (ie.
we should check to see if they exist in 3.6 and change version if needed)


*Will need updated per minor release*

  6

Non-Regression Version 3.6 Bugs

All non regression 3.6 bugs….just seems to be next logical list J 3.6 is
still officially recommended

*http://tinyurl.com/b8aly8k*

* *

*(this is all version 3.6 bugs including regressions)*



*Will need updated per minor release*

7

All Remaining Bugs

Everything else

*http://tinyurl.com/aytplg9*

* *

*(all bugs reported against versions lower than 3.6 including see in
summary & undefined)*





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

Hang/crash in templates

2013-04-24 Thread Fridrich Strba 
Hello, good people,

We have a crash (on systems with low memory) or hang (with more memory)
in templates. It is a problem with all templates but one can see it in
impress directly, because the template previews are part of the standard
side-bar and we regenerate the template cache there.

I investigated a bit, but then I have no idea how to find more. Just in
case it rings a bell to someone, here are my findings:

In svtools/source/misc/templatefoldercache.cxx, we have this part of code:

402) sal_Int32 nChildren = 0;
403) m_rStorage >> nChildren;
404) TemplateFolderContent& rChildren = _rContent.getSubContents();
405) rChildren.resize( 0 );
406) rChildren.reserve( nChildren );

The line 403 gives us a bogus number relatively big. I received
something bigger then 0x7000 .
Then the line 406 will try to preallocate that memory that might be
around 2-4GB. On some systems it crashes, on others it pages and hangs.

Maybe if some QA people could try to bibisect it, it would be nice. The
problem is that one needs to have another machine connected by ssh to be
able to kill the soffice.bin that hangs. But then on some low-memory
laptops, it could crash which would be easier to handle.

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-04-24 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 62667, which changed state.

Bug 62667 Summary: CALC OLE object PRINTING with missing cell borders
https://bugs.freedesktop.org/show_bug.cgi?id=62667

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-04-24 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 61913, which changed state.

Bug 61913 Summary: particular OLE objects suppress PRINTING of .wmf
https://bugs.freedesktop.org/show_bug.cgi?id=61913

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
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: 2 commits - sw/qa writerfilter/source

2013-04-24 Thread Luboš Luňák 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx |   15 ---
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9
Author: Luboš Luňák 
Date:   Wed Apr 24 20:48:53 2013 +0200

check for NS_ooxml::LN_CT_Style_type being processed first

The code relies on NS_ooxml::LN_CT_Style_type being handled first
(because of m_pImpl->m_pCurrentEntry being reset there), so
at least check for it. Still no idea how to actually ensure
the correct ordering in this overdesigned $#%@! writerfilter thing.

Change-Id: Ib6a2129a078728e162257275ac2a1243dbaf4017

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 8766d73..f0569fa 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -63,9 +63,6 @@ StyleSheetEntry::StyleSheetEntry() :
 ,sNextStyleIdentifier()
 ,pProperties(new StyleSheetPropertyMap)
 {
-#if OSL_DEBUG_LEVEL > 1
-nStyleTypeCode = STYLE_TYPE_PARA;
-#endif
 }
 
 StyleSheetEntry::~StyleSheetEntry()
@@ -370,6 +367,14 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
 (void)nIntValue;
 OUString sValue = val.getString();
 
+// The default type is paragraph, and it needs to be processed first,
+// because the NS_ooxml::LN_CT_Style_type handling may set 
m_pImpl->m_pCurrentEntry
+// to point to a different object.
+if( m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_UNKNOWN )
+{
+if( Name != NS_rtf::LN_SGC && Name != NS_ooxml::LN_CT_Style_type )
+m_pImpl->m_pCurrentEntry->nStyleTypeCode = STYLE_TYPE_PARA;
+}
 switch(Name)
 {
 case NS_rtf::LN_ISTD:
@@ -385,6 +390,8 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
 }
 break;
 case NS_rtf::LN_SGC:
+SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != 
STYLE_TYPE_UNKNOWN,
+"writerfilter", "Style type needs to be processed first" );
 m_pImpl->m_pCurrentEntry->nStyleTypeCode = (StyleType)nIntValue;
 break;
 case NS_rtf::LN_ISTDBASE:
@@ -421,6 +428,8 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
 break;
 case NS_ooxml::LN_CT_Style_type:
 {
+SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != 
STYLE_TYPE_UNKNOWN,
+"writerfilter", "Style type needs to be processed first" );
 StyleType nType = ( StyleType ) nIntValue;
 if ( nType == STYLE_TYPE_TABLE )
 {
commit f853a20839ab08244dc1b3b1c881822bd593bc04
Author: Luboš Luňák 
Date:   Wed Apr 24 20:48:04 2013 +0200

temporarily disable conditionalstyles-tbllook.docx test

writerfilter relies on boost::unordered_map being ordered in a specific
way, temporarily disable until that's sorted out somehow

Change-Id: I5fdb70223e39e2048a45e0b81ffc2c714e1c4532

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 25e4495..27387ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -182,7 +182,7 @@ void Test::run()
 {"fdo60922.docx", &Test::testFdo60922},
 {"fdo59273.docx", &Test::testFdo59273},
 {"table_width.docx", &Test::testTableWidth},
-{"conditionalstyles-tbllook.docx", 
&Test::testConditionalstylesTbllook},
+//{"conditionalstyles-tbllook.docx", 
&Test::testConditionalstylesTbllook},
 {"fdo63685.docx", &Test::testFdo63685},
 };
 header();
___
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

2013-04-24 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 63498, which changed state.

Bug 63498 Summary: Personas doesn't work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=63498

   What|Removed |Added

 Status|REOPENED|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] help.git: helpers/help_hid.lst source/text

2013-04-24 Thread Caolán McNamara 
 helpers/help_hid.lst |4 
 source/text/scalc/guide/cell_protect.xhp |5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 887ad70ec215ad0420b4cee830fd72b22e4f9127
Author: Caolán McNamara 
Date:   Wed Apr 24 19:41:18 2013 +0100

make protect sheet help find suitable topic

Change-Id: Ic2b8c566b69554f49cea07fa22ca63c61df3d0bb

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index be12c27..1fea194 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6506,7 +6506,6 @@ 
sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_HEADER,2567095300,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_REGEXP,2567095299,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_UNIQUE,2567095297,
-sc_CheckBox_RID_SCDLG_TABPROTECTION_BTN_PROTECT,1495630852,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -6598,8 +6597,6 @@ sc_Edit_RID_SCDLG_STRINPUT_ED_INPUT,1493469194,
 sc_Edit_RID_SCDLG_TABOP_ED_COLCELL,2567899139,
 sc_Edit_RID_SCDLG_TABOP_ED_FORMULARANGE,2567899137,
 sc_Edit_RID_SCDLG_TABOP_ED_ROWCELL,2567899138,
-sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD1,1495631878,
-sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD2,1495631880,
 sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
 sc_Edit_RID_SCPAGE_USERLISTS_ED_COPYFROM,956844035,
 sc_Edit_TP_VALIDATION_ERROR_EDT_TITLE,548309005,
@@ -6724,7 +6721,6 @@ sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976,
 sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136,
-sc_ModalDialog_RID_SCDLG_TABPROTECTION,1495629824,
 sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
 sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060,
diff --git a/source/text/scalc/guide/cell_protect.xhp 
b/source/text/scalc/guide/cell_protect.xhp
index 4f44afd..5318931 100644
--- a/source/text/scalc/guide/cell_protect.xhp
+++ b/source/text/scalc/guide/cell_protect.xhp
@@ -36,7 +36,8 @@
   changing; sheet protection
   hiding;formulas
   formulas;hiding
-MW transferred "modifying;..." and "changing;..." into one 
index entry
+
+
 Protecting Cells from Changes
 
   In %PRODUCTNAME Calc you can 
protect sheets and the document as a whole. You can choose whether the cells 
are protected against accidental changes, whether the formulas can be viewed 
from within Calc, whether the cells are visible or whether the cells can be 
printed.
@@ -81,4 +82,4 @@
  
   

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-04-24 Thread Caolán McNamara 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bb3e33f1181c3415efc672bbbc5fe3849c5ca59
Author: Caolán McNamara 
Date:   Wed Apr 24 19:41:18 2013 +0100

Updated core
Project: help  887ad70ec215ad0420b4cee830fd72b22e4f9127

diff --git a/helpcontent2 b/helpcontent2
index 1909db9..887ad70 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1909db99ab7d23a71e24bac25693b3a22d73bfa3
+Subproject commit 887ad70ec215ad0420b4cee830fd72b22e4f9127
___
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

2013-04-24 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 63498, which changed state.

Bug 63498 Summary: Personas doesn't work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=63498

   What|Removed |Added

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

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

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

2013-04-24 Thread Caolán McNamara 
 sc/uiconfig/scalc/ui/protectsheetdlg.ui  |4 
 sc/uiconfig/scalc/ui/sharedocumentdlg.ui |2 ++
 sd/uiconfig/sdraw/ui/insertlayer.ui  |1 +
 3 files changed, 7 insertions(+)

New commits:
commit 7ff261c690cc10fd0d19e84a204c87f3a2bba65c
Author: Caolán McNamara 
Date:   Wed Apr 24 19:35:55 2013 +0100

add some mnemonic widgets and default buttons

Change-Id: Ic6637f920bb8529ec67c58d5cdcc29a26f1b17c3

diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui 
b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
index dc1b443..fcd7dd5 100644
--- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -215,6 +215,7 @@
 0
 Allow 
all users of this sheet to:
 True
+checklist:border
   
   
 False
@@ -228,6 +229,9 @@
 False
 True
 True
+
+  
+
   
   
 False
diff --git a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui 
b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
index f8a13b6..f39a2d9 100644
--- a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
+++ b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui
@@ -37,6 +37,8 @@
 gtk-ok
 True
 True
+True
+True
 True
 True
   
diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui 
b/sd/uiconfig/sdraw/ui/insertlayer.ui
index 4ff980e..5df3252 100644
--- a/sd/uiconfig/sdraw/ui/insertlayer.ui
+++ b/sd/uiconfig/sdraw/ui/insertlayer.ui
@@ -36,6 +36,7 @@
 gtk-ok
 True
 True
+True
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - extras/source sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/uiconfig svtools/source svx/source

2013-04-24 Thread Caolán McNamara 
 extras/source/glade/libreoffice-catalog.xml.in |3 
 sc/AllLangResTarget_sc.mk  |1 
 sc/UIConfig_scalc.mk   |1 
 sc/source/ui/inc/protectiondlg.hrc |   38 ---
 sc/source/ui/inc/protectiondlg.hxx |   23 --
 sc/source/ui/miscdlgs/protectiondlg.cxx|   89 +++-
 sc/source/ui/miscdlgs/protectiondlg.src|  125 ---
 sc/uiconfig/scalc/ui/protectsheetdlg.ui|  108 ++
 sd/uiconfig/sdraw/ui/modifylayer.ui|  270 -
 svtools/source/contnr/treelistbox.cxx  |6 
 svx/source/dialog/checklbx.cxx |   13 +
 11 files changed, 135 insertions(+), 542 deletions(-)

New commits:
commit adfacdd91cb67ed7f2ae0d4991537211d263278d
Author: Caolán McNamara 
Date:   Wed Apr 24 16:57:16 2013 +0100

adapt code to protect sheet .ui

Change-Id: Ic3c375e87cf89a3956f3703c6facbcbe5ffd5d58

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 4774077..9275f78 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -132,6 +132,9 @@
 
+
 
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index c25cc42..2a3adcc 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/miscdlgs/retypepassdlg.src \
 sc/source/ui/miscdlgs/highred.src \
 sc/source/ui/miscdlgs/conflictsdlg.src \
-sc/source/ui/miscdlgs/protectiondlg.src \
 sc/source/ui/miscdlgs/acredlin.src \
 sc/source/ui/formdlg/formdlgs.src \
 sc/source/ui/formdlg/dwfunctr.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 89ad302..48a8da0 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/printeroptions \
+   sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/selectsource \
diff --git a/sc/source/ui/inc/protectiondlg.hrc 
b/sc/source/ui/inc/protectiondlg.hrc
deleted file mode 100644
index 5c806de..000
--- a/sc/source/ui/inc/protectiondlg.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-
-#define BTN_OK  1
-#define BTN_CANCEL  2
-#define BTN_HELP3
-
-#define BTN_PROTECT 4
-#define FT_PASSWORD15
-#define ED_PASSWORD16
-#define FT_PASSWORD27
-#define ED_PASSWORD28
-#define FL_OPTIONS  9
-#define FT_OPTIONS 10
-#define CLB_OPTIONS11
-
-#define ST_SELECT_PROTECTED_CELLS  50
-#define ST_SELECT_UNPROTECTED_CELLS51
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/protectiondlg.hxx 
b/sc/source/ui/inc/protectiondlg.hxx
index 2eb6abd..ad1afb9 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class Window;
@@ -48,23 +49,19 @@ private:
 
 void EnableOptionalWidgets(bool bEnable = true);
 
-CheckBoxmaBtnProtect;
+CheckBox*m_pBtnProtect;
 
-FixedText   maPassword1Text;
-EditmaPassword1Edit;
-FixedText   maPassword2Text;
-EditmaPassword2Edit;
+VclContainer*m_pPasswords;
+VclContainer*m_pOptions;
+Edit*m_pPassword1Edit;
+Edit*m_pPassword2Edit;
 
-FixedLine   maOptionsLine;
-FixedText   maOptionsText;
-SvxCheckListBox maOptionsListBox;
+SvxCheckListBox* m_pOptionsListBox;
 
-OKButtonmaBtnOk;
-CancelButtonmaBtnCancel;
-HelpButton  maBtnHelp;
+OKButton*

Re: Empty Advanced options page on Windows

2013-04-24 Thread Thomas Arnhold 

On 24.04.2013 17:12, Stephan Bergmann wrote:

On Linux with no JRE installed it works. The list is just empty.


But maybe Kohei's Windows build was configure --without-java, and that
would make the difference?  (Seeing that SOLAR_JAVA does get mentioned
in the relevant parts of module cui.)


Indeed that's the problem! With ./autogen.sh --without-java the dialog 
is empty.


warn:legacy.tools:31230:1:cui/source/options/treeopt.cxx:1099: tabpage 
could not created


Thomas

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

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

Jorendc  changed:

   What|Removed |Added

 Depends on||62088

--- Comment #13 from Jorendc  ---
I nominate "Bug 62088 - Impress crashes on setting master pages" because of the
regression 4.0 vs 4.1.

-- 
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 'feature/formula-core-rework' - 3 commits - sc/source

2013-04-24 Thread Kohei Yoshida 
 sc/source/core/data/column3.cxx |   36 
 1 file changed, 24 insertions(+), 12 deletions(-)

New commits:
commit 2ae8576f3f8ed90502c787113a75334975a8bc3f
Author: Kohei Yoshida 
Date:   Wed Apr 24 14:11:37 2013 -0400

Adding comment as I go along...

Change-Id: I3f95b2a1a4b180c23e82bdeec8279707220532d5

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9ad0061..3eb4b17 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2094,6 +2094,7 @@ void ScColumn::RebuildFormulaGroups()
  !rCur.pCell || !rPrev.pCell ||// 
paranoia
  rCur.pCell->GetCellType() != rPrev.pCell->GetCellType() ) // same 
type
 {
+// Non-contiguous cell detected. Break the series.
 pLastDouble = NULL;
 continue;
 }
commit c97c38747c03673282f6776371eb8b740614533b
Author: Kohei Yoshida 
Date:   Wed Apr 24 13:08:21 2013 -0400

Let's use std::for_each for this.

Change-Id: I74f59ad697eb5ff28b81cd883db58ba9f19c086c

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index cb82b3c..9ad0061 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2051,6 +2051,23 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
 return nStringLen;
 }
 
+namespace {
+
+struct CellGroupSetter : std::unary_function
+{
+ScFormulaCellGroupRef mxGroup;
+public:
+CellGroupSetter(const ScFormulaCellGroupRef& xGroup) : mxGroup(xGroup) {}
+
+void operator() (ColEntry& rEntry)
+{
+if (rEntry.pCell && rEntry.pCell->GetCellType() == CELLTYPE_FORMULA)
+static_cast(rEntry.pCell)->SetCellGroup(mxGroup);
+}
+};
+
+}
+
 // Very[!] slow way to look for and merge contiguous runs
 // of similar formulae into a formulagroup
 void ScColumn::RebuildFormulaGroups()
@@ -2064,12 +2081,7 @@ void ScColumn::RebuildFormulaGroups()
 
 // clear previous groups
 ScFormulaCellGroupRef xNone;
-for (size_t i = 0; i < maItems.size(); i++)
-{
-ColEntry &rCur = maItems[ i ];
-if ( rCur.pCell && rCur.pCell->GetCellType() == CELLTYPE_FORMULA )
-static_cast( rCur.pCell )->SetCellGroup( xNone );
-}
+std::for_each(maItems.begin(), maItems.end(), CellGroupSetter(xNone));
 maFnGroups.clear();
 
 // re-build groups
commit 44b3b80400fb0e812cc4cce334df3c7f737469c5
Author: Kohei Yoshida 
Date:   Wed Apr 24 11:13:08 2013 -0400

Wrap inside smart pointer on instantiation, for exception safety.

And boost::intrusive_ptr has a bool operator; no need to call get()
in this case.

Change-Id: I8ca965349c13dd0fedc16dc0d535b8c337fce52c

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e69a8cc..cb82b3c 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2119,15 +2119,14 @@ void ScColumn::RebuildFormulaGroups()
 }
 
 ScFormulaCellGroupRef xGroup = pPrev->GetCellGroup();
-if ( !xGroup.get() )
+if (!xGroup)
 {
 // create a new group ...
-ScFormulaCellGroup *pGroup = new ScFormulaCellGroup();
-pGroup->mpDelta = pDelta;
-pGroup->mnStart = rPrev.nRow;
-pGroup->mnLength = 2;
+xGroup.reset(new ScFormulaCellGroup);
+xGroup->mpDelta = pDelta;
+xGroup->mnStart = rPrev.nRow;
+xGroup->mnLength = 2;
 
-xGroup.reset( pGroup );
 maFnGroups.push_back( xGroup );
 
 pCur->SetCellGroup( xGroup );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Patch] Bug 47302-Adding a new field in "Insert->Fields"

2013-04-24 Thread Thorsten Behrens 
Vishv Brahmbhatt wrote:
> I am hereby attaching my patch for review.
> 
Hi Vishv,

wow, impressive work - compiles & works mostly fine here!!

Two things - there's a lot of whitespace change in your patch, and
also some trailing whitespace on some lines (the git commit hooks
complain about it) - could you clean that up?

And then, loading and saving this new field does not yet work. I think
the relevant code lives here:

 xmloff/source/text/txtfld{ei}.cxx

The scripting/workben/bindings/impressmenubar.xml change, you can just
skip, that seems example code.

As an extra, it seems changing the slide name does not update the
field content, possibly some
Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)) or somesuch missing at
a strategic place? Of course, happy to merge w/o, and/or help with
tracking that nit down. :)

> Also there is new file created
> @offapi/com/sun/star/text/textfield/SlideName.idl for the patch. So I am
> attaching that file too.
> 
You can just git add offapi/com/sun/star/text/textfield/SlideName.idl
it, will then be included in your subsequent commit.

Cheers,

-- Thorsten


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

[PUSHED] fdo#60949: Move the last libs to OOOLIBS

2013-04-24 Thread via Code Review 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3561

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Marcos Souza 
Gerrit-Reviewer: Matúš Kukan 

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

[PATCH] fdo#60949: Move the last libs to OOOLIBS

2013-04-24 Thread via Code Review 
Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/3561

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

Change subject: fdo#60949: Move the last libs to OOOLIBS
..

fdo#60949: Move the last libs to OOOLIBS

Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
---
M Repository.mk
M scp2/source/base/postgresqlsdbc.scp
M scp2/source/canvas/canvascommons.scp
M scp2/source/canvas/directxcanvas.scp
M scp2/source/canvas/vclcanvas.scp
M scp2/source/gnome/file_gnome.scp
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_pdfimport.scp
8 files changed, 52 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/4
-- 
To view, visit https://gerrit.libreoffice.org/3561
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Marcos Souza 
Gerrit-Reviewer: Matúš Kukan 

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

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-24 Thread Marcos Paulo de Souza 
 Repository.mk|   56 +--
 scp2/source/base/postgresqlsdbc.scp  |4 +-
 scp2/source/canvas/canvascommons.scp |4 +-
 scp2/source/canvas/directxcanvas.scp |4 +-
 scp2/source/canvas/vclcanvas.scp |2 -
 scp2/source/gnome/file_gnome.scp |2 -
 scp2/source/ooo/file_library_ooo.scp |   50 +--
 scp2/source/ooo/module_pdfimport.scp |7 
 8 files changed, 52 insertions(+), 77 deletions(-)

New commits:
commit 95f2f5f4d1a6d94788ea4e3905c25ddd69eb3d9b
Author: Marcos Paulo de Souza 
Date:   Mon Apr 22 15:51:17 2013 -0300

fdo#60949: Move the last libs to OOOLIBS

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

diff --git a/Repository.mk b/Repository.mk
index 0ccc03d..054d9a3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -579,28 +579,56 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 PresenterScreen \
 basprov \
 cairocanvas \
+canvasfactory \
+cmdmail \
+directx9canvas \
 dlgprov \
 expwrap \
 fastsax \
+fpicker \
+fps_office \
 gconfbe1 \
+gdipluscanvas \
+hatchwindowfactory \
 i18nsearch \
 kdebe1 \
 kde4be1 \
 ldapbe2 \
+losessioninstall \
+macbe1 \
 migrationoo2 \
 migrationoo3 \
 msforms \
 mtfrenderer \
 OGLTrans \
+passwordcontainer \
+pdfimport \
+postgresql-sdbc \
+postgresql-sdbc-impl \
 pythonloader \
+simplecanvas \
 slideshow \
 stringresource \
+syssh \
 tdebe1 \
+ucpcmis1 \
+ucpext \
 ucpgio1 \
 ucpgvfs1 \
+ucptdoc1 \
+updatefeed \
 vbaevents \
 vbaobj \
 vbaswobj \
+vclcanvas \
+$(if $(filter $(OS),MACOSX), \
+fps_aqua \
+) \
+$(if $(filter $(OS),WNT), \
+oleautobridge \
+smplmail \
+wininetbe1 \
+) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
@@ -612,36 +640,8 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
ucpexpand1 \
 ))
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
-canvasfactory \
-cmdmail \
 directx5canvas \
-directx9canvas \
-fpicker \
-fps_office \
-gdipluscanvas \
-hatchwindowfactory \
-losessioninstall \
-macbe1 \
 nullcanvas \
-passwordcontainer \
-pdfimport \
-postgresql-sdbc \
-postgresql-sdbc-impl \
-simplecanvas \
-syssh \
-ucpcmis1 \
-ucpext \
-ucptdoc1 \
-updatefeed \
-vclcanvas \
-$(if $(filter $(OS),MACOSX), \
-fps_aqua \
-) \
-   $(if $(filter $(OS),WNT), \
-   oleautobridge \
-   smplmail \
-   wininetbe1 \
-   ) \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
diff --git a/scp2/source/base/postgresqlsdbc.scp 
b/scp2/source/base/postgresqlsdbc.scp
index 90e8631..fddf458 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -45,9 +45,9 @@ Module gid_Module_Optional_PostgresqlSdbc
 Styles = ();
 End
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno)
+STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, 
postgresql-sdbc-impl.uno)
+STD_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl)
 
 File gid_File_PostgresqlSdbc_Ini
 TXT_FILE_BODY;
diff --git a/scp2/source/canvas/canvascommons.scp 
b/scp2/source/canvas/canvascommons.scp
index f390a9e..c2e6ec5 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,5 +27,5 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
+STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp 
b/scp2/source/canvas/directxcanvas.scp
index cfa762d..7c36bec 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -28,6 +28,6 @@
 #include "macros.inc"
 
 #ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
+STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
+STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas)
 #endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index c17301f..48bf5f9 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -27,4 +27,4 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanv

[PATCH libreoffice-4-0] fdo#330191 a NULL value of float type is not NaN

2013-04-24 Thread Lionel Elie Mamane (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3599

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3599/1

fdo#330191 a NULL value of float type is not NaN

but it is *still* NULL.

This was initially done to "fix" i#108092,
but i#112652 comment 13 suggests this may have been fixed more cleanly.

Change-Id: I2b76af2182715bc489cb89dd45d6b77d5038b506
---
M 
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
1 file changed, 0 insertions(+), 5 deletions(-)



diff --git 
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
 
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 1489098..9f0340a 100644
--- 
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ 
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -73,11 +73,6 @@
 {
 FormatValueUtility.applyValueForCell(value.getValue(), 
attributeMap, valueType);
 }
-else if ( "float".equals(valueType))
-{
-attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
-FormatValueUtility.VALUE, "NaN");
-}
 // #i114108#: except on form elements, the only value-type that can
 // occur without an accomanying value attribute is "string"
 else if (!"string".equals(valueType))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b76af2182715bc489cb89dd45d6b77d5038b506
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane 

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

[PATCH] Patch fdo#60265 - Document converter wizard fails to find po...

2013-04-24 Thread Anurag Kanungo (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3598

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/3598/1

Patch fdo#60265 - Document converter wizard fails to find powerpoint files to 
convert

We can atleast provide support for these three formats ppt,pptm,ppts as

i have modified the file and now it is converting also these formats :

ppt
pptm
pptx

to odp

but

Formats ppsx , pps , ppsm are not being detected or converted still .
I think there is some problem with these formats support .

If required i will add the log and the test files , in which ppt,pptm,pptx are 
being converted

and we require make-dev-install to make it work , as make wizards doesnt modify 
the build .

Log :

PowerPoint documents
Source documents
Target documents
f.ppt
f.odp

PowerPoint documents
Source documents
Target documents
d.pptm
d.odp

PowerPoint documents
Source documents
Target documents
h.pptx
h.odp
3 documents converted

Change-Id: Idfe793f17d5b7143efeec1bba348210733480801
---
M wizards/source/importwizard/DialogModul.xba
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/wizards/source/importwizard/DialogModul.xba 
b/wizards/source/importwizard/DialogModul.xba
index a9ea8f9..92ca877 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -344,9 +344,9 @@
MSFilterName(1,3) = sMSDocumentCheckBox(1)
MSFilterName(1,4) = "Excel"
 
-   MSFilterName(2,0) = "ppt|pps|pptx|pptm|ppsx|ppsm"
-   MSFilterName(2,1) = 
"impress8|impress8|impress8|impress8|impress8|impress8"
-   MSFilterName(2,2) = "odp|odp"
+   MSFilterName(2,0) = "ppt|pptm|pptx"
+   MSFilterName(2,1) = "impress8|impress8|impress8"
+   MSFilterName(2,2) = "odp"
MSFilterName(2,3) = sMSDocumentCheckBox(2)
MSFilterName(2,4) = "PowerPoint"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe793f17d5b7143efeec1bba348210733480801
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Anurag Kanungo 

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

[Libreoffice-commits] core.git: 3 commits - reportbuilder/java reportdesign/source

2013-04-24 Thread Lionel Elie Mamane 
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 |5 ---
 reportdesign/source/filter/xml/xmlExport.cxx   
  |   16 ++
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 3a4534be6594c39bf785502e15f2dec22d15b312
Author: Lionel Elie Mamane 
Date:   Wed Apr 24 14:56:00 2013 +0200

fdo#330191 a NULL value of float type is not NaN

but it is *still* NULL.

This was initially done to "fix" i#108092,
but i#112652 comment 13 suggests this may have been fixed more cleanly.

Change-Id: I2b76af2182715bc489cb89dd45d6b77d5038b506

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index dd07f8b..79b5be6 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -73,11 +73,6 @@ public class TableCellLayoutController extends 
SectionLayoutController
 {
 FormatValueUtility.applyValueForCell(value.getValue(), 
attributeMap, valueType);
 }
-else if ( "float".equals(valueType))
-{
-attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS,
-FormatValueUtility.VALUE, "NaN");
-}
 // #i114108#: except on form elements, the only value-type that can
 // occur without an accompanying value attribute is "string"
 else if (!"string".equals(valueType))
commit 3591f5c429d8d5f0f2afc136c03b114e26ae1bb1
Author: Lionel Elie Mamane 
Date:   Wed Apr 24 14:47:22 2013 +0200

janitorial

Change-Id: I5b5c679c4c6d1e0b2742249f60aec213834f7501

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 445248c..713611f 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -860,7 +860,7 @@ void ORptExport::exportContainer(const Reference< 
XSection>& _xSection)
 if ( nCellType == util::NumberFormat::TEXT )
 aHelper.SetNumberFormatAttributes(sEmpty, 
sEmpty);
 else
-aHelper.SetNumberFormatAttributes(nFormatKey, 
0.0,sal_False);
+aHelper.SetNumberFormatAttributes(nFormatKey, 
0.0, sal_False);
 }
 }
 SvXMLElementExport aCell(*this,XML_NAMESPACE_TABLE, 
XML_TABLE_CELL, sal_True, sal_False);
commit 1b7235573643b898602ccc31eb983c71941aa12c
Author: Lionel Elie Mamane 
Date:   Wed Apr 24 14:46:32 2013 +0200

fdo#33091 recognise General format in all languages

As opposed to only the current UI language

Change-Id: Iaaaec78e9cbe1891c3e42f207a6da552b2a2bf7d

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index a4e03b5..445248c 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -848,12 +848,16 @@ void ORptExport::exportContainer(const Reference< 
XSection>& _xSection)
 if ( xFormattedField.is() )
 {
 sal_Int32 nFormatKey = xFormattedField->getFormatKey();
-if ( 0 != nFormatKey )
+XMLNumberFormatAttributesExportHelper 
aHelper(GetNumberFormatsSupplier(),*this);
+bool bIsStandard = false;
+OUString sEmpty;
+sal_Int16 nCellType = 
aHelper.GetCellType(nFormatKey,bIsStandard);
+// "Standard" means "no format set, value could be 
anything",
+// so don't set a format attribute in this case.
+// P.S.: "Standard" is called "General" in some 
languages
+if (!bIsStandard)
 {
-XMLNumberFormatAttributesExportHelper 
aHelper(GetNumberFormatsSupplier(),*this);
-bool bIsStandard = false;
-OUString sEmpty;
-if ( util::NumberFormat::TEXT == 
aHelper.GetCellType(nFormatKey,bIsStandard) )
+if ( nCellType == util::NumberFormat::TEXT )
 aHelper.SetNumberFormatAttributes(sEmpty, 
sEmpty);
 else
 aHelper.SetNumberFormatAttributes(nFormatKey, 
0.0,sal_False);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedeskto

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

2013-04-24 Thread Michael Stahl 
 solenv/gbuild/AllLangResTarget.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f4b9d3f0cfbcd4dfb1f8234e4009641822747cd6
Author: Michael Stahl 
Date:   Wed Apr 24 19:07:52 2013 +0200

gbuild: AllLangResTarget: add missing dependency on concat-deps

... was missing from 8379fceb2e7c33e5e0555295be06fde60a6bb240

Change-Id: I664cfabdaf8834b1023dcc7e2a28b584abf10908

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index c413460..2ac22b2 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -253,7 +253,8 @@ $(call gb_SrsTarget_get_target,%) :
cat $^ > $@)
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,%) :
+$(call gb_SrsTarget_get_dep_target,%) : \
+   $(call gb_Executable_get_runtime_dependencies,concat-deps)
$(call gb_SrsTarget__command_dep,$@,$*,$^)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: testtools/CustomTarget_bridgetest_climaker.mk unoil/CustomTarget_climaker.mk

2013-04-24 Thread Stephan Bergmann 
 testtools/CustomTarget_bridgetest_climaker.mk |6 ++
 unoil/CustomTarget_climaker.mk|7 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit ae75a0dd0b687242302ff2ad2369f7a5edaf09f3
Author: Stephan Bergmann 
Date:   Wed Apr 24 18:56:34 2013 +0200

More "Let climaker work on *.rdb.oldformat for now"

...also, the use of double use of udkapi.rdb in climaker call in
testtools/CustomTarget_bridgetest_climaker.mk looked fishy.

Change-Id: I8be22b184740d65e567df65bae51fe18066be102

diff --git a/testtools/CustomTarget_bridgetest_climaker.mk 
b/testtools/CustomTarget_bridgetest_climaker.mk
index 19086d2..469e698 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -40,9 +40,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
-   --out $@ \
-   -X $(call gb_UnoApiTarget_get_target,udkapi) \
-   -r $(OUTDIR)/bin/cli_uretypes.dll \
-   $< > /dev/null)
+   --out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \
+   $(call gb_UnoApiTarget_get_target,udkapi).oldformat > /dev/null)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 990ed26..9d1ef46 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -19,7 +19,8 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
 
 $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
-   $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+   $(call gb_UnoApiTarget_get_target,offapi) \
+   $(call gb_UnoApiTarget_get_target,udkapi) \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_runtime_dependencies,climaker) \
| $(unoil_CLIDIR)/.dir
@@ -31,10 +32,10 @@ $(unoil_CLIDIR)/cli_oootypes.dll : 
$(SRCDIR)/unoil/climaker/version.txt \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
--assembly-company "LibreOffice" \
--assembly-description "This assembly contains metadata for the 
LibreOffice API." \
-   -X $(OUTDIR)/bin/udkapi.rdb \
+   -X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \
-r $(OUTDIR)/bin/cli_uretypes.dll \
--keyfile $(OUTDIR)/bin/cliuno.snk \
-   $(OUTDIR)/bin/offapi.rdb) > /dev/null)
+   $(call gb_UnoApiTarget_get_target,offapi).oldformat) > 
/dev/null)
 
 $(unoil_CLIDIR)/cli_oootypes.config : \
$(SRCDIR)/unoil/climaker/cli_oootypes_config \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#62643 sw: fix autocomplate wrt. adding to a partially fi...

2013-04-24 Thread Fridrich Strba (via Code Review) 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3580

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6a1202e139a0eb30cac482a2bb528ef70c7797f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna 
Gerrit-Reviewer: Fridrich Strba 

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

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

2013-04-24 Thread Miklos Vajna 
 sw/inc/acmplwrd.hxx |   17 -
 sw/source/core/doc/acmplwrd.cxx |   42 ++---
 sw/source/ui/docvw/edtwin.cxx   |  125 +++-
 3 files changed, 21 insertions(+), 163 deletions(-)

New commits:
commit 66ca78799975d1855ba794a75d3ecabf53cef10b
Author: Miklos Vajna 
Date:   Tue Apr 23 15:27:47 2013 +0200

fdo#62643 sw: fix autocomplate wrt. adding to a partially finished word

This partially reverts commits 1eee77f2c2b4fa5f693708218c74a8f3909649a6
and 51f9e894f46e718200a14bcd61e9e44c64bc5396.

(cherry picked from commit d92932744fdbaa78cec8dd8b991d5f442f6eef4b)

Conflicts:
sw/source/core/doc/acmplwrd.cxx
sw/source/ui/docvw/edtwin.cxx

Change-Id: Ie6a1202e139a0eb30cac482a2bb528ef70c7797f
Reviewed-on: https://gerrit.libreoffice.org/3580
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 52a3777..7b2f40b 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -68,21 +68,8 @@ public:
 
 void CheckChangedList(const editeng::SortedAutoCompleteStrings& rNewLst);
 
-// Resets the current position within the tree to its root node.
-void returnToRoot();
-
-// Advances to a given node within the AutoComplete tree.
-void gotoNode(OUString sNode);
-
-// Advances from the current position towards the node keyed with cKey.
-void advance(const sal_Unicode cKey);
-
-// Goes back one char within the tree, except if the current node is 
already the root node.
-void goBack();
-
-// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos 
is set, the current
-// position within the tree is ignored and replaced by aMatch.
-bool GetWordsMatching(String aMatch, std::vector& aWords, bool 
bIgnoreCurrentPos) const;
+// Returns all words matching a given prefix aMatch.
+bool GetWordsMatching(String aMatch, std::vector& aWords) const;
 };
 
 
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 8548545..3588290 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -346,44 +346,16 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
 nMinWrdLen = n;
 }
 
-// Resets the current position within the tree to its root node.
-void SwAutoCompleteWord::returnToRoot()
-{
-m_LookupTree->returnToRoot();
-}
-
-// Advances to a given node within the AutoComplete tree.
-void SwAutoCompleteWord::gotoNode(OUString sNode)
-{
-m_LookupTree->gotoNode( sNode );
-}
-
-// Advances from the current position towards the node keyed with cKey.
-void SwAutoCompleteWord::advance(const sal_Unicode cKey)
-{
-m_LookupTree->advance( cKey );
-}
-
-// Goes back one char within the tree, except if the current node is already 
the root node.
-void SwAutoCompleteWord::goBack()
-{
-m_LookupTree->goBack();
-}
-
-// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos is 
set, the current
-// position within the tree is ignored and replaced by aMatch.
-bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector& 
aWords, bool bIgnoreCurrentPos) const
+/** Return all words matching a given prefix
+ *
+ *  @param aMatch the prefix to search for
+ *  @param aWords the words to search in
+ */
+bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector& 
aWords) const
 {
 OUString aStringRoot = OUString( aMatch );
 
-// The lookup tree already contains the information about the root keyword 
in most cases. Only if we don't trust that
-// information (e.g. if we need some autocompletion for a place other than 
the main writing area), the location within
-// the tree needs to be refreshed.
-if (bIgnoreCurrentPos)
-{
-m_LookupTree->gotoNode( aStringRoot );
-}
-
+m_LookupTree->gotoNode( aStringRoot );
 OUString aAutocompleteWord = m_LookupTree->suggestAutoCompletion();
 if (aAutocompleteWord.isEmpty())
 {
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 27853a8..37210b2 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -280,7 +280,7 @@ struct QuickHelpData
 }
 
 // Fills internal structures with hopefully helpful information.
-void FillStrArr( SwWrtShell& rSh, const String& rWord, bool 
bIgnoreCurrentPos );
+void FillStrArr( SwWrtShell& rSh, const String& rWord );
 void SortAndFilter();
 };
 
@@ -1497,19 +1497,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 sal_Bool bStopKeyInputTimer = sal_True;
 String sFmlEntry;
 
-enum SW_AutoCompleteAction { ACA_NoOp,// No maintenance 
operation required for AutoComplete tree
- ACA_ReturnToRoot,// Input of a char 
marking the end of a word, like '.', ' ', etc.
- ACA_SingleCharInput,
- ACA_SingleBackspa

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

2013-04-24 Thread Eike Rathke 
 solenv/bin/create-ids |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 82b1e07f6259236e0d443e473476f0227b860ce2
Author: Eike Rathke 
Date:   Wed Apr 24 18:35:49 2013 +0200

removed cruft, added instdir to filter

Change-Id: I30b1b923658a851535f309c3773f5cbfa697d1bf

diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index f820882..8c3f935 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -19,8 +19,8 @@ fi
 
 # --with-outpath includes solver/$INPATH/inc
 if [ "$1" = "--with-outpath" ]; then
-dirs="`ls -d */* | sed -e 
'/\(\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|install\)\//d'`
 solver/$INPATH/inc"
+dirs="`ls -d */* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'`
 solver/$INPATH/inc"
 else
-dirs="`ls -d */* | sed -e 
'/\(\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|install\)\//d'`"
+dirs="`ls -d */* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|solver\|workdir\|instdir\|install\)\//d'`"
 fi
 mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl java make' 
--statistics $dirs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeiOS.conf solenv/gbuild

2013-04-24 Thread Tor Lillqvist 
 distro-configs/LibreOfficeiOS.conf |1 +
 solenv/gbuild/LinkTarget.mk|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 704be0f489d04fe9ea4251699f381e8ccadb63ca
Author: Tor Lillqvist 
Date:   Wed Apr 24 19:42:07 2013 +0300

Prevent gb_Helper_PHONY from leaking into the shell

Change-Id: Ifec0ea4dd06c9c06a796f293f0fc0973296fed60

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9151444..35896fe 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -114,7 +114,7 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_Object__command_dep
 mkdir -p $(dir $(1)) && \
-   echo "$(2) : $$(gb_Helper_PHONY)" > $(1)
+   echo "$(2) : $(gb_Helper_PHONY)" > $(1)
 
 endef
 else
commit 30b680477b11ccf993a59c8f81fa5ee2166e4eb5
Author: Tor Lillqvist 
Date:   Wed Apr 24 19:24:35 2013 +0300

Add --disable-neon

Change-Id: Icf9d75e699e8a430ce0d2a305e1b696d8023466b

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index ef1940f..695dd83 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -9,6 +9,7 @@
 --disable-gstreamer
 --disable-lockdown
 --disable-lotuswordpro
+--disable-neon
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source smoketest/losmoketest

2013-04-24 Thread Stephan Bergmann 
 scp2/source/smoketest/module_smoketest.scp |1 
 scp2/source/smoketest/smoketest.scp|   33 -
 smoketest/losmoketest  |2 -
 3 files changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 831b4983033fa17b736298f960436d923d2af45b
Author: Stephan Bergmann 
Date:   Wed Apr 24 18:37:54 2013 +0200

Fix losmoketest UNO_TYPES

...and remove a bunch of unused Directories

Change-Id: Ibb20bf9f4049eee136132b4ebda86ec2a9613a29

diff --git a/scp2/source/smoketest/module_smoketest.scp 
b/scp2/source/smoketest/module_smoketest.scp
index 480dd9c..4ad76fa 100644
--- a/scp2/source/smoketest/module_smoketest.scp
+++ b/scp2/source/smoketest/module_smoketest.scp
@@ -37,7 +37,6 @@ Module gid_Module_Optional_Smoketest
 Files = (gid_Test_File_Txt_License,
  gid_Test_File_Txt_Readme,
  gid_Test_File_Misc_Smoketestdoc,
- gid_Test_File_Misc_TypesRdb,
  gid_Test_File_Bin_LOSmoketest,
  gid_Test_File_Exe_Cppunittester,
  gid_Test_File_Lib_Cppunit,
diff --git a/scp2/source/smoketest/smoketest.scp 
b/scp2/source/smoketest/smoketest.scp
index e07fc77..af625ed 100644
--- a/scp2/source/smoketest/smoketest.scp
+++ b/scp2/source/smoketest/smoketest.scp
@@ -95,31 +95,6 @@ Directory gid_Test_Brand_Dir_Share_Test
 DosName = "test";
 End
 
-Directory gid_Test_Dir_Common_Ure
-#if defined MACOSX
-ParentID = gid_Test_Dir_Bundle_Contents;
-#else
-ParentID = gid_Test_Dir_Brand_Root;
-#endif
-HostName = "ure";
-Styles = (UREDIRECTORY);
-End
-
-Directory gid_Test_Dir_Ure_Share
-ParentID = gid_Test_Dir_Common_Ure;
-DosName = "share";
-End
-
-Directory gid_Test_Dir_Ure_Misc
-ParentID = gid_Test_Dir_Ure_Share;
-DosName = "misc";
-End
-
-Directory gid_Test_Dir_Ure_Misc_Test
-ParentID = gid_Test_Dir_Ure_Misc;
-DosName = "test";
-End
-
 
 File gid_Test_File_Txt_License
 TXT_FILE_BODY;
@@ -152,14 +127,6 @@ File gid_Test_File_Misc_Smoketestdoc
 Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Test_File_Misc_TypesRdb
-TXT_FILE_BODY;
-Dir = gid_Test_Dir_Ure_Misc_Test;
-Name = "udkapi.rdb";
-InstallName = "types.rdb";
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
-End
-
 File gid_Test_File_Bin_LOSmoketest
 BIN_FILE_BODY;
 Dir = gid_Test_Brand_Dir_Program;
diff --git a/smoketest/losmoketest b/smoketest/losmoketest
index b3faee1..e327f7c 100755
--- a/smoketest/losmoketest
+++ b/smoketest/losmoketest
@@ -52,7 +52,7 @@ esac
 
 exec $sd_prog/cppunittester \
-env:UNO_SERVICES=file://$sd_prog/../ure/share/misc/services.rdb \
-   -env:UNO_TYPES=file://$sd_prog/../ure/share/misc/test/types.rdb \
+   -env:UNO_TYPES=file://$sd_prog/../ure/share/misc/types.rdb\ 
file://$sd_prog/types/offapi.rdb \
-env:arg-soffice=path:$sd_prog/soffice \
-env:arg-user=$user_conf_dir \
-env:arg-env=$LD_LIBRARY_PATH \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] Converted Tools -> Protect Document-> Document widget.

2013-04-24 Thread via Code Review 
Caolán McNamara has abandoned this change.

Change subject: Converted Tools -> Protect Document-> Document widget.
..


Patch Set 1: Abandoned

already converted

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ia947ee7430fba8151a682299e7221339dd61dcd1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Noel Grandin 

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

Re: About coverity 988424 (svdfppt.cxx from filter module)

2013-04-24 Thread Caolán McNamara 
On Sat, 2013-03-16 at 14:03 -0700, julien2412 wrote:
> Hello,
> 
> Scan coverity detected this: 
> CID 988424 (#1 of 1): Logically dead code (DEADCODE)dead_error_line:
> Execution cannot reach this expression "nExtBuInd + nExtParaNibble <
> aStyleTextProp9->size()" inside statement "if (nExtParaNibble && nExtB...". 
> 
> Indeed, we have these lines:
>5026 if ( nExtParaPos )
>5027 {
>5028 sal_uInt32 nExtBuInd = nMask & 0x3c00;
>5029 sal_uInt32  nExtParaNibble = 0;
>5030 if ( nExtBuInd )
>5031 nExtBuInd = ( aSet.mnFlags & 0x3c00 ) >> 10;
>5032 if ( nExtBuInd < aStyleTextProp9.size() )
>5033 {
>5034 if ( nExtParaNibble && ( ( nExtBuInd + nExtParaNibble )
> < aStyleTextProp9.size() ) )
>5035 nExtBuInd += nExtParaNibble;
> 
> (see
> http://opengrok.libreoffice.org/xref/core/filter/source/msfilter/svdfppt.cxx#5026)
> 
> Any idea what should be done?

Git doesn't seem able to track back to where this code was really
originally written across the old version control file moves and
removes. But throwing some key words into google I can find the original
code, and can determine it happened with
"StyleTextProp with empty text PPT import (bnc#485630) [Thorsten]" which
appeared to get merged to OpenOffice.org from ooo-build in Jun 2009.

The original code it was based on was originally a loop where multiple
properties were read and it made sense to increment nExtParaNibble
between properties. Now it doesn't.

So, yeah, all lines with nExtParaNibble in them or depend on those lines
or exist only to set that value can be removed as it enters the
condition as 0, and gets useless set to non 0 after exiting the
condition.

C.

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

[PATCH] fdo#60949: Move the last libs to OOOLIBS

2013-04-24 Thread Marcos Souza (via Code Review) 
Hello LibreOffice gerrit bot, Matúš Kukan,

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

https://gerrit.libreoffice.org/3561

to look at the new patch set (#3).

Change subject: fdo#60949: Move the last libs to OOOLIBS
..

fdo#60949: Move the last libs to OOOLIBS

Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
---
M Repository.mk
M scp2/source/base/postgresqlsdbc.scp
M scp2/source/canvas/canvascommons.scp
M scp2/source/canvas/directxcanvas.scp
M scp2/source/canvas/vclcanvas.scp
M scp2/source/gnome/file_gnome.scp
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_pdfimport.scp
8 files changed, 52 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/3
-- 
To view, visit https://gerrit.libreoffice.org/3561
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Marcos Souza 
Gerrit-Reviewer: Matúš Kukan 

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

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

2013-04-24 Thread Stephan Bergmann 
 solenv/gbuild/CliUnoApi.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f22030043f2b625bc28c6e910dbea8a3230b3bcc
Author: Stephan Bergmann 
Date:   Wed Apr 24 18:08:02 2013 +0200

Let climaker work on *.rdb.oldformat for now

...as it still reads type data via com.sun.star.registry.SimpleRegistry

Change-Id: Ib65848eb77d220b83f5e70cb98ecf3cb9c46d7de

diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 92e599c..008fa73 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -68,19 +68,19 @@ $(call gb_CliUnoApiTarget_get_target,$(1)) : 
CLI_UNOAPI_VERSION := $(2)
 endef
 
 define gb_CliUnoApiTarget_wrap_api
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API := $(call 
gb_UnoApi_get_target,$(2))
-$(call gb_CliUnoApiTarget_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
+$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API := $(call 
gb_UnoApiTarget_get_target,$(2)).oldformat
+$(call gb_CliUnoApiTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(2))
 
 endef
 
 define gb_CliUnoApiTarget__use_api
-$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2)
+$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2).oldformat
 $(call gb_CliUnoApiTarget_get_target,$(1)) : $(2)
 
 endef
 
 define gb_CliUnoApiTarget_use_api
-$(foreach api,$(2),$(call gb_CliUnoApiTarget__use_api,$(1),$(call 
gb_UnoApi_get_target,$(api
+$(foreach api,$(2),$(call gb_CliUnoApiTarget__use_api,$(1),$(call 
gb_UnoApiTarget_get_target,$(api
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bugs that need triaged ASAP - Potential Regressions within Release

2013-04-24 Thread Bjoern Michaelsen 
Hi,

On Wed, Apr 24, 2013 at 05:26:51PM +0200, Stephan Bergmann wrote:
> On 04/24/2013 05:22 PM, Bjoern Michaelsen wrote:
> >On Wed, Apr 24, 2013 at 04:01:58PM +0200, Stephan Bergmann wrote:
> >>That link leads to some fancy table with numbers, but nothing that
> >>can be scanned quickly for bug titles where a developer might say
> >>"hm, that sounds like I might know something about it, lets see."
> >
> >Clicking on any of these numbers (including those in the totals row) should 
> >help.
> 
> That doesn't help.  If the data is not presented in a form that one
> can scan it quickly, the requested action will simply not happen.

If you click on the "39" in Total/Fixed you get this:

 
https://bugs.freedesktop.org/buglist.cgi?action=wrap&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f1=version&f2=version&f3=status_whiteboard&keywords=regression%2C%20&keywords_type=allwords&o1=substring&o2=nowordssubstr&o3=notsubstring&product=LibreOffice&v1=3.6.&v2=3.6.0&resolution=FIXED&list_id=293336

but indeed clicking the "16" in Total/Unresolved seems to be broken (and shows
the resolved ones too -- likely because it has the empty string matching
everything), here is the tweaked and fixed query:

 
https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20&keywords_type=allwords&f1=version&o3=notsubstring&list_id=293342&o1=substring&resolution=---&o2=nowordssubstr&query_format=advanced&f3=status_whiteboard&f2=version&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&v1=3.6.&v2=3.6.0&product=LibreOffice

For the "Fixed, but not fixed in 3.6" ones clicking on the "7" at Total/Total 
shows:

 
https://bugs.freedesktop.org/buglist.cgi?action=wrap&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f1=version&f2=version&f3=status_whiteboard&keywords=regression%2C%20&keywords_type=allwords&o1=substring&o2=nowordssubstr&o3=notsubstring&product=LibreOffice&v1=3.6.&v2=3.6.0&v3=target%3A3.6&resolution=FIXED&list_id=293346

All of these contain the bug summary for quick scanning. What do I miss?

Best,

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

[Libreoffice-commits] core.git: android/sdremote

2013-04-24 Thread Ota Chasák 
 android/sdremote/Makefile| 
   2 
 android/sdremote/res/layout/presentation_clockbar.xml| 
  17 -
 android/sdremote/res/values/strings.xml  | 
  10 
 android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 
 136 +-
 4 files changed, 97 insertions(+), 68 deletions(-)

New commits:
commit b6ab91d55e1bfb487abba2b15589a1988178ee88
Author: Ota Chasák 
Date:   Wed Apr 24 15:59:20 2013 +0100

fdo#60791 - fix android remote count-down / clock.

diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 26acfd8..78b89eb 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -13,7 +13,7 @@ endif
 all: properties translations.done
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar 
../abs-lib/libs
-   $(ANT) -quiet debug
+   $(ANT) debug
 
 properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
diff --git a/android/sdremote/res/layout/presentation_clockbar.xml 
b/android/sdremote/res/layout/presentation_clockbar.xml
index 4d5d028..98b913c 100644
--- a/android/sdremote/res/layout/presentation_clockbar.xml
+++ b/android/sdremote/res/layout/presentation_clockbar.xml
@@ -73,15 +73,20 @@
 android:background="#DD4D4D4D"
 android:orientation="horizontal" >
 
-
+
+   
-
+android:background="#"
+android:text="@string/clock_timer_reset"
+android:textColor="#FF" />
 
 Your connection has been 
dropped.
 Please try to reconnect
 This is still an experimental feature. You 
need to \"enable experimental features\" in 
\"Preference\"-\"LibreOffice\"-\"Advanced\" on your computer. \nThe use over 
Bluetooth is recommanded.
-
+
+5:00
+10:00
+15:00
+20:00
+30:00
+45:00
+
+You have entered wrong time 
format
 
diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 51e590f..ab081df 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -23,6 +23,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -37,10 +38,11 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -205,8 +207,7 @@ public class PresentationActivity extends 
SherlockFragmentActivity {
 }
 
 private class ActionBarManager implements OnClickListener,
-FragmentManager.OnBackStackChangedListener,
-TextView.OnEditorActionListener {
+FragmentManager.OnBackStackChangedListener {
 
 private Handler timerHandler = new Handler();
 
@@ -226,8 +227,12 @@ public class PresentationActivity extends 
SherlockFragmentActivity {
 
 // --- COUNTDOWN BAR
 private View mCountdownBar;
-private EditText mCountdownEntry;
 private Button mCountdownButton;
+private Button mCountdownButtonReset;
+private AutoCompleteTextView mCountDownTime;
+
+private SharedPreferences prefs;
+private static final String COUNTDOWN_KEY = "countdownTime";
 
 private String aTimeFormat = getResources().getString(
 R.string.actionbar_timeformat);
@@ -305,13 +310,22 @@ public class PresentationActivity extends 
SherlockFragmentActivity {
 // Countdown bar
 mCountdownBar = mOuterLayout
 .findViewById(R.id.clockbar_countdownbar);
-
-mCountdownEntry = (EditText) mCountdownBar
-.findViewById(R.id.clockbar_countdown_time);
 mCountdownButton = (Button) mCountdownBar
 .findViewById(R.id.clockbar_countdown_button);
+mCountdownButton.setTag(Boolean.valueOf(false));
+mCountdownButtonReset = (Button) 
mCountdownBar.findViewById(R.id.clockbar_countdown_reset);
+mCountdownButtonReset.setTag(Boolean.valueOf(false));
+
+prefs = 
PreferenceManager.getDefaultSharedPreferences(m

Re: PATCH made available under the MPL/LGPLv3+

2013-04-24 Thread Michael Meeks 
Hi Ota,

On Tue, 2013-04-23 at 20:37 +0200, Ota Chasák wrote:
> I have repaired bug 60791. Please let me know, if I can push the
> changes, or sending a diff is OK.

Sending a diff is just great :-) thanks for your fix !

It seems to work nicely; but having said that - it seems that something
changed / broke in impress on master such that we can't get the active
frame and get the slideshow setup there - which is annoying / odd (but
not your problem :-).

Thanks for the fix ! It'd be great to have a MPLv2/LGPLv3+ license
statement sent to the list for all your contributions (not just this
one) that we can link into here:

http://wiki.documentfoundation.org/Development/Developers

Nice work,

Michael.

PS. I was still looking for a better widget to do a drop-down to select
common times there, AFAICS there is nothing we can really use for
that ...
-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: 8 commits - desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/

2013-04-24 Thread Michael Stahl 
 desktop/Executable_quickstart.mk|2 
 desktop/Executable_sbase.mk |2 
 desktop/Executable_scalc.mk |2 
 desktop/Executable_sdraw.mk |2 
 desktop/Executable_simpress.mk  |2 
 desktop/Executable_smath.mk |2 
 desktop/Executable_soffice.mk   |2 
 desktop/Executable_soffice_bin.mk   |2 
 desktop/Executable_sweb.mk  |2 
 desktop/Executable_swriter.mk   |2 
 desktop/WinResTarget_quickstart.mk  |8 +--
 desktop/WinResTarget_sbase.mk   |   10 ++--
 desktop/WinResTarget_scalc.mk   |   10 ++--
 desktop/WinResTarget_sdraw.mk   |   10 ++--
 desktop/WinResTarget_simpress.mk|   10 ++--
 desktop/WinResTarget_smath.mk   |   10 ++--
 desktop/WinResTarget_soffice.mk |   10 ++--
 desktop/WinResTarget_sofficebin.mk  |   10 ++--
 desktop/WinResTarget_sweb.mk|   10 ++--
 desktop/WinResTarget_swriter.mk |   10 ++--
 extensions/Library_npsoplugin.mk|6 +-
 extensions/Library_so_activex.mk|2 
 extensions/Library_so_activex_x64.mk|2 
 extensions/WinResTarget_activex.mk  |   10 ++--
 extensions/WinResTarget_npsoplugin.mk   |4 -
 fpicker/Library_fps.mk  |2 
 fpicker/WinResTarget_fps.mk |4 -
 include/default.rc  |   72 +++
 include/shlinfo.rc  |   72 ---
 solenv/gbuild/AllLangResTarget.mk   |5 +-
 solenv/gbuild/LinkTarget.mk |2 
 solenv/gbuild/PrecompiledHeaders.mk |4 -
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   12 +
 solenv/gbuild/platform/com_MSC_class.mk |   22 +++--
 solenv/gbuild/processdeps.awk   |   73 
 soltools/mkdepend/def.h |1 
 soltools/mkdepend/main.c|   12 +
 soltools/mkdepend/pr.c  |   34 +-
 vcl/Library_vcl.mk  |3 -
 vcl/WinResTarget_vcl.mk |8 +--
 40 files changed, 212 insertions(+), 256 deletions(-)

New commits:
commit 8379fceb2e7c33e5e0555295be06fde60a6bb240
Author: Michael Stahl 
Date:   Wed Apr 24 16:04:33 2013 +0200

gbuild: AllLangResTarget: use concat-deps

Change-Id: Ieb5e380b6e7a1c097d403f962b4e82b84cce40b5

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 29f6bc0..c413460 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -237,7 +237,8 @@ define gb_SrsTarget__command_dep
 $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
-   cat $(3) > $(1))
+   RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
+   $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
 endef
 endif
 
commit 7019a1c67473623cb81ca0c9e155b90a5ce6947a
Author: Michael Stahl 
Date:   Wed Apr 24 16:08:46 2013 +0200

gbuild: get rid of processdeps.awk

The only thing that processdeps.awk does that is actually useful is to
be able to set the target name freely, but that is only important for
the default resource file which was just renamed.

Instead hack makedepend to provide the required functionality directly:
- write dummy rules for included files so builds don't break on
  rename/removal
- format deps one per line like concat-deps expects
- concat-deps expects standard POSIX line ends, so open in binary mode
  (also disable that awful backup copying nonsense)

Though in retrospect it would perhaps be a better investment of time to
try to replace makedepend...

Change-Id: I54fafdcdcf1a52692e62b8f1f4b96fb9a93d4421

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 2acbc6c..8df958f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -362,13 +362,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE) \
$(DEFS) \
$(RCFILE) \
-   -f - \
-   | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-   -v OBJECTFILE=$(3) \
-   -v OUTDIR=$(OUTDIR)/ \
-   -v WORKDIR=$(WORKDIR)/ \
-   -v SRCDIR=$(SRCDIR)/ \
-   > $(1))
+   -o .res \
+   -p $(dir $(3)) \
+   -f $(1))
 endef
 else
 gb_WinResTarget__command_target =
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 92b8e03..94db603 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -484,13 +484,9 @@ $(call gb_Helper_abbreviate_dirs,\
$(INCLUDE) \
$(DEFS) \
$(2) \
-   -f - \
-

[PUSHED] Converted Tools -> Protect Document-> Sheet widget.

2013-04-24 Thread via Code Review 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3516

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved

Objections:
  Noel Grandin: This need some tweaks before it is merged


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic701a2a92ddbf48be6998c0b278ec5f232f49983
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Noel Grandin 

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

Re: Customizing LO: "finalized" options and the key icon

2013-04-24 Thread Caolán McNamara 
On Tue, 2013-04-23 at 10:14 +0200, Andreas Heinlein wrote:
> Hello,
> 
> I am currently checking some custom extensions at our site for 
> compatibility with LO 4. We are currently using OO.o 3.3 and want to 
> migrate. One extension sets several options and locks them down using 
> "finalized=true", for example "RemovePersonalInfoOnSaving".
> 
> This used to be shown with a key icon and a disabled entry in the 
> corresponding options dialog in OO.o. In LO 4 the key icon is not shown 
> and the option can be changed, despite it's being reset after the next 
> launch.
> 
> Am I missing some change here, or has this been dropped from LO?

AFAIK this should still work. Best thing is to file a bug with e.g. a
minimal extension that can be used to test it.

C.


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

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

2013-04-24 Thread Abdulelah Alarifi 
 sc/uiconfig/scalc/ui/protectsheetdlg.ui |  288 
 1 file changed, 288 insertions(+)

New commits:
commit 83709cc62e3bc9ee930b5a59e994a0001bd8c221
Author: Abdulelah Alarifi 
Date:   Sun Apr 21 11:02:24 2013 +0300

Converted Tools -> Protect Document-> Sheet widget.

Change-Id: Ic701a2a92ddbf48be6998c0b278ec5f232f49983
Reviewed-on: https://gerrit.libreoffice.org/3516
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui 
b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
new file mode 100644
index 000..be6f5f9
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -0,0 +1,288 @@
+
+
+  
+  
+False
+6
+Protect Sheet
+dialog
+
+  
+False
+2
+
+  
+False
+vertical
+start
+
+  
+gtk-ok
+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
+False
+vertical
+10
+
+  
+True
+False
+vertical
+6
+
+  
+P_rotect this 
sheet and the contents of protected cells
+True
+True
+False
+True
+0
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+6
+20
+
+  
+True
+False
+0
+_Password
+True
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+0
+_Confirm
+True
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+True
+•
+  
+  
+1
+0
+1
+1
+  
+
+
+  
+True
+True
+•
+  
+  
+1
+1
+1
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+vertical
+6
+
+  
+True
+False
+0
+Allow 
all users of this sheet to:
+

Re: Bugs that need triaged ASAP - Potential Regressions within Release

2013-04-24 Thread Stephan Bergmann 

On 04/24/2013 05:22 PM, Bjoern Michaelsen wrote:

On Wed, Apr 24, 2013 at 04:01:58PM +0200, Stephan Bergmann wrote:

That link leads to some fancy table with numbers, but nothing that
can be scanned quickly for bug titles where a developer might say
"hm, that sounds like I might know something about it, lets see."


Clicking on any of these numbers (including those in the totals row) should 
help.


That doesn't help.  If the data is not presented in a form that one can 
scan it quickly, the requested action will simply not happen.


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

[PATCH libreoffice-4-0-3] fdo#59259: Suppress the expensive parts when we are only wri...

2013-04-24 Thread Jan Holesovsky (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3597

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3597/1

fdo#59259: Suppress the expensive parts when we are only writing to metafile.

When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile.  Unfortunately, here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.

The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.

Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
---
M vcl/source/gdi/outdev6.cxx
1 file changed, 3 insertions(+), 0 deletions(-)



diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 46eb689..85f6ce5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -614,6 +614,9 @@
 if( mpMetaFile )
 mpMetaFile->AddAction( new MetaFloatTransparentAction( rMtf, rPos, 
rSize, rTransparenceGradient ) );
 
+if ( !IsDeviceOutputNecessary() )
+return;
+
 if( ( rTransparenceGradient.GetStartColor() == aBlack && 
rTransparenceGradient.GetEndColor() == aBlack ) ||
 ( mnDrawMode & ( DRAWMODE_NOTRANSPARENCY ) ) )
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Jan Holesovsky 

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

Re: Bugs that need triaged ASAP - Potential Regressions within Release

2013-04-24 Thread Bjoern Michaelsen 
On Wed, Apr 24, 2013 at 04:01:58PM +0200, Stephan Bergmann wrote:
> That link leads to some fancy table with numbers, but nothing that
> can be scanned quickly for bug titles where a developer might say
> "hm, that sounds like I might know something about it, lets see."

Clicking on any of these numbers (including those in the totals row) should 
help.

Best,

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

[Libreoffice-commits] core.git: 2 commits - config_host/config_lgpl.h.in configure.ac include/tubes lotuswordpro/source sd/source ucb/source

2013-04-24 Thread Michael Meeks 
 config_host/config_lgpl.h.in |   14 ++
 configure.ac |   10 --
 include/tubes/file-transfer-helper.h |1 +
 lotuswordpro/source/filter/lwpheader.hxx |5 +
 sd/source/ui/remotecontrol/Communicator.cxx  |   14 +-
 ucb/source/ucp/webdav-neon/ContentProperties.hxx |1 +
 ucb/source/ucp/webdav-neon/DAVAuthListener.hxx   |1 +
 ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx   |1 +
 ucb/source/ucp/webdav-neon/DAVException.hxx  |1 +
 ucb/source/ucp/webdav-neon/DAVProperties.hxx |1 +
 ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx |1 +
 ucb/source/ucp/webdav-neon/DAVResource.hxx   |1 +
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx |1 +
 ucb/source/ucp/webdav-neon/DAVSession.hxx|1 +
 ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx |1 +
 ucb/source/ucp/webdav-neon/DAVTypes.hxx  |1 +
 ucb/source/ucp/webdav-neon/DateTimeHelper.hxx|1 +
 ucb/source/ucp/webdav-neon/LinkSequence.cxx  |2 +-
 ucb/source/ucp/webdav-neon/LockEntrySequence.cxx |2 +-
 ucb/source/ucp/webdav-neon/LockSequence.cxx  |2 +-
 ucb/source/ucp/webdav-neon/LockSequence.hxx  |1 +
 ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx   |1 +
 ucb/source/ucp/webdav-neon/NeonInputStream.hxx   |1 +
 ucb/source/ucp/webdav-neon/NeonLockStore.hxx |1 +
 ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx   |1 +
 ucb/source/ucp/webdav-neon/NeonSession.hxx   |1 +
 ucb/source/ucp/webdav-neon/NeonTypes.hxx |1 +
 ucb/source/ucp/webdav-neon/NeonUri.hxx   |1 +
 ucb/source/ucp/webdav-neon/PropertyMap.hxx   |1 +
 ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx  |2 +-
 ucb/source/ucp/webdav-neon/webdavcontent.hxx |1 +
 ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx|1 +
 ucb/source/ucp/webdav-neon/webdavprovider.hxx|1 +
 ucb/source/ucp/webdav-neon/webdavresultset.hxx   |1 +
 34 files changed, 62 insertions(+), 15 deletions(-)

New commits:
commit 5f91bce07962f4229242c466144962f9b3d58be6
Author: Michael Meeks 
Date:   Wed Apr 24 16:20:58 2013 +0100

sdremote - don't crash if we connect during load, before things are setup.

Change-Id: I1837ea58b9c8f74aca9afb78bafbab61af189842

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx 
b/sd/source/ui/remotecontrol/Communicator.cxx
index e5459fb..63ace55 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -53,11 +53,15 @@ void Communicator::execute()
 Receiver aReceiver( pTransmitter );
 try {
 uno::Reference< frame::XDesktop2 > xFramesSupplier = 
frame::Desktop::create( ::comphelper::getProcessComponentContext() );
-uno::Reference< frame::XFrame > xFrame ( 
xFramesSupplier->getActiveFrame(), uno::UNO_QUERY_THROW );
-uno::Reference xPS ( 
xFrame->getController()->getModel(), uno::UNO_QUERY_THROW);
-uno::Reference xPresentation(
-xPS->getPresentation(), uno::UNO_QUERY_THROW);
-if ( xPresentation->isRunning() )
+uno::Reference< frame::XFrame > xFrame ( 
xFramesSupplier->getActiveFrame(), uno::UNO_QUERY );
+
+uno::Reference xPS;
+if( xFrame.is() )
+xPS = uno::Reference( 
xFrame->getController()->getModel(), uno::UNO_QUERY );
+uno::Reference xPresentation;
+if( xPS.is() )
+xPresentation = uno::Reference( 
xPS->getPresentation(), uno::UNO_QUERY );
+if ( xPresentation.is() && xPresentation->isRunning() )
 {
 presentationStarted( xPresentation->getController() );
 }
commit cb33ae88e000fb6c662ecf31a621a73223dfd081
Author: Michael Meeks 
Date:   Wed Apr 24 14:52:46 2013 +0100

extend license filtering, and add fallback-checks.

Change-Id: Ia1ec3564326cf898d756c231a64a54db8698bf20

diff --git a/config_host/config_lgpl.h.in b/config_host/config_lgpl.h.in
new file mode 100644
index 000..f81b337
--- /dev/null
+++ b/config_host/config_lgpl.h.in
@@ -0,0 +1,14 @@
+/*
+ * Include this file to ensure that this code is not
+ * compiled into the MPL subset.
+ */
+#ifndef CONFIG_LGPL_H
+#define CONFIG_LGPL_H
+
+#define MPL_HAVE_SUBSET 0
+
+#if MPL_HAVE_SUBSET
+#  error "Attempting to compile LGPL code into MPL subset"
+#endif
+
+#endif
diff --git a/configure.ac b/configure.ac
index a002d93..14a721e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6944,12 +6944,17 @@ AC_MSG_CHECKING([MPL subset])
 MPL_SUBSET=
 if test "$enable_mpl_subset" = "yes"; then
if test "x$enable_postgresql_sdbc" != "xno"; then
-AC_MSG_ERROR([need to --disable-postgresql-sdbc.])
+AC_MSG_ERROR([need to --disable-postgresql-sdbc - the postgress 
database backend.])
fi

[PUSHED] fix fdo#60910 FILESAVE loses fontwork/shape objects

2013-04-24 Thread Fridrich Strba (via Code Review) 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3596

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luke Deller 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Fridrich Strba 

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

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

2013-04-24 Thread Luke Deller 
 svx/source/svdraw/svdoashp.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15bbafaaed52182e80f1a24d716a2d181cdc0e17
Author: Luke Deller 
Date:   Thu Apr 25 00:00:54 2013 +1000

fix fdo#60910 FILESAVE loses fontwork/shape objects

This reinstates one line of code which was removed by
7fec8dfcaca4efc92516f9af51a3157f1a11ccd7.

Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
Reviewed-on: https://gerrit.libreoffice.org/3596
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 67bd0a5..fd0c5c8 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3217,6 +3217,7 @@ bool SdrObjCustomShape::doConstructOrthogonal(const 
OUString& rName)
 void SdrObjCustomShape::InvalidateRenderGeometry()
 {
 mXRenderedCustomShape = 0L;
+mxCustomShapeEngine = 0L;
 SdrObject::Free( mpLastShadowGeometry );
 mpLastShadowGeometry = 0L;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeiOS.conf ios/experimental

2013-04-24 Thread Tor Lillqvist 
 distro-configs/LibreOfficeiOS.conf |2 ++
 ios/experimental/LibreOffice/LibreOffice/lo.mm |2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3892f465b426c0c4f452398792db370c6dc0b10
Author: Tor Lillqvist 
Date:   Wed Apr 24 18:13:03 2013 +0300

Bin lotuswordpro_component_getFactory

Not suitably licensed.

Change-Id: I221cccb9d2ff5b6cb5e25161b6d5bfe504acb10e

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm 
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 11ecaa3..bbd5bce 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -33,7 +33,6 @@ extern "C" {
 extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lotuswordpro_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * pricing_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -83,7 +82,6 @@ lo_get_libmap(void)
 { "libhyphenlo.a", hyphen_component_getFactory },
 { "liblnglo.a", lng_component_getFactory },
 { "liblnthlo.a", lnth_component_getFactory },
-{ "liblwpftlo.a", lotuswordpro_component_getFactory },
 { "libooxlo.a", oox_component_getFactory },
 { "libpricinglo.a", pricing_component_getFactory },
 { "libscdlo.a", scd_component_getFactory },
commit 4c35d7b943d171b85194cff7a1101a2ca957d477
Author: Tor Lillqvist 
Date:   Wed Apr 24 16:01:53 2013 +0300

Add --enable-mpl-subset --disable-lotuswordpro

Change-Id: I648e5c23704125e939eceda9ac29217f1c63cd47

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index 61a67bb..ef1940f 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -8,6 +8,7 @@
 --disable-gstreamer-0-10
 --disable-gstreamer
 --disable-lockdown
+--disable-lotuswordpro
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc
@@ -16,6 +17,7 @@
 --disable-randr-link
 --disable-systray
 --disable-vba
+--enable-mpl-subset
 --without-afms
 --without-fonts
 --without-java
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Empty Advanced options page on Windows

2013-04-24 Thread Stephan Bergmann 

On 04/24/2013 04:21 PM, Thomas Arnhold wrote:

On 23.04.2013 16:40, Caolán McNamara wrote:

On Wed, 2013-04-17 at 08:49 -0400, Kohei Yoshida wrote:

I just completed my Windows build of the master branch and noticed
that, the Advanced options page is for some reason totally blank.  If
my attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?


No, but java options are in there aren't they ? I wonder if the same
thing would happen on Linux if no JREs are detected to list in it ?


On Linux with no JRE installed it works. The list is just empty.


But maybe Kohei's Windows build was configure --without-java, and that 
would make the difference?  (Seeing that SOLAR_JAVA does get mentioned 
in the relevant parts of module cui.)


Stephan

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

[PUSHED] modifylayer.ui widget

2013-04-24 Thread via Code Review 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3515

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved

Objections:
  Noel Grandin: This need some tweaks before it is merged


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bc3cb888c44df590993e1ebd32e5544dd08e805
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Noel Grandin 

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

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

2013-04-24 Thread Alia Almusaireae 
 sd/uiconfig/sdraw/ui/modifylayer.ui |  270 
 1 file changed, 270 insertions(+)

New commits:
commit 39d22359ad767c9ef34345ff5134b895af43f9d4
Author: Alia Almusaireae 
Date:   Sun Apr 21 10:29:49 2013 +0300

modifylayer.ui widget

Change-Id: I1bc3cb888c44df590993e1ebd32e5544dd08e805
Reviewed-on: https://gerrit.libreoffice.org/3515
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sd/uiconfig/sdraw/ui/modifylayer.ui 
b/sd/uiconfig/sdraw/ui/modifylayer.ui
new file mode 100644
index 000..5c33d7b
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/modifylayer.ui
@@ -0,0 +1,270 @@
+
+
+  
+  
+False
+6
+Modify Layer
+dialog
+
+  
+False
+vertical
+2
+
+  
+False
+start
+
+  
+gtk-help
+True
+True
+True
+False
+True
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-ok
+True
+True
+True
+True
+False
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+False
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+True
+●
+True
+  
+
+  
+
+
+  
+True
+False
+_Name
+True
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+True
+●
+True
+  
+
+  
+
+
+  
+True
+False
+_Title
+True
+True
+  
+
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+
+  
+True
+True
+●
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+vertical
+  
+  
+False
+True
+1
+  
+
+  
+
+  
+
+
+  
+True
+False
+_Description
+True
+True
+  
+
+  
+  
+False
+True
+3
+  
+
+
+  
+_Visible
+True
+True
+False
+False
+True
+0
+True
+  
+  
+False
+True
+4
+  
+
+
+  
+_Printable
+True
+True
+False
+False
+

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

2013-04-24 Thread Caolán McNamara 
 helpers/help_hid.lst |6 --
 source/text/simpress/01/0402.xhp |   18 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 1909db99ab7d23a71e24bac25693b3a22d73bfa3
Author: Caolán McNamara 
Date:   Wed Apr 24 16:05:32 2013 +0100

update helpids for insert layer .ui conversion

Change-Id: I7d1e28d6d1dee286589a2e8ff2a363357d18592a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5b3aeda..be12c27 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6850,9 +6850,6 @@ sd_CheckBox_DLG_ASS_CB_PAGE5_SUMMARY,1088488511,
 sd_CheckBox_DLG_ASS_CB_PREVIEW,1088488455,
 sd_CheckBox_DLG_ASS_CB_STARTWITH,1088488456,
 sd_CheckBox_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW,1087554561,
-sd_CheckBox_DLG_INSERT_LAYER_CBX_LOCKED,1077986313,
-sd_CheckBox_DLG_INSERT_LAYER_CBX_PRINTABLE,1077986312,
-sd_CheckBox_DLG_INSERT_LAYER_CBX_VISIBLE,1077986311,
 sd_CheckBox_DLG_INSERT_PAGES_OBJS_CBX_CHECK_MASTERS,1089111042,
 sd_CheckBox_DLG_INSERT_PAGES_OBJS_CBX_LINK,1089111041,
 sd_CheckBox_DLG_MORPH_CBX_ATTRIBUTES,1084441601,
@@ -6923,8 +6920,6 @@ sd_Edit_DLG_ASS_EDT_PAGE4_ASKNAME,1088489495,
 sd_Edit_DLG_ASS_EDT_PAGE4_ASKTOPIC,1088489497,
 sd_Edit_DLG_DEFINE_CUSTOMSHOW_EDT_NAME,1088325633,
 sd_Edit_DLG_DESIGNNAME_EDT_NAME,1085868035,
-sd_Edit_DLG_INSERT_LAYER_EDT_NAME,1077987330,
-sd_Edit_DLG_INSERT_LAYER_EDT_TITLE,1077987332,
 sd_Edit_DLG_PUBLISHING_PAGE2_CGI,1085851696,
 sd_Edit_DLG_PUBLISHING_PAGE2_INDEX,1085851692,
 sd_Edit_DLG_PUBLISHING_PAGE2_URL,1085851694,
@@ -7005,7 +7000,6 @@ sd_ModalDialog_DLG_PUBLISHING,1085849600,
 sd_ModalDialog_DLG_TABLEDESIGNPANE,1417379840,
 sd_ModalDialog_RID_SD_DLG_MASTER_LAYOUT,1090142208,
 sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011,
-sd_MultiLineEdit_DLG_INSERT_LAYER_EDT_DESCRIPTION,1077987846,
 sd_MultiLineEdit_DLG_PUBLISHING_PAGE4_MISC,1085852234,
 sd_MultiListBox_DLG_DEFINE_CUSTOMSHOW_LB_PAGES,1088326657,
 sd_NumericField_DLG_COPY_NUM_FLD_COPIES,1085659137,
diff --git a/source/text/simpress/01/0402.xhp 
b/source/text/simpress/01/0402.xhp
index 60803fa..063614b 100644
--- a/source/text/simpress/01/0402.xhp
+++ b/source/text/simpress/01/0402.xhp
@@ -30,22 +30,22 @@
 
 
 
-Insert Layer
+Insert Layer
 Inserts a new 
layer in the document. Layers are only available in Draw, not in Impress. 

 
 
   
 
 To select a layer, click the corresponding tab at the bottom of the 
workspace.
-Name
-Enter a name for the 
new layer.
+Name
+Enter a name for the 
new layer.
 Properties
 Set the properties for the new layer.
-Visible
-Show or hide 
the layer.
-Printable
-When 
printing, print or ignore this particular layer.
-Locked
-Prevent 
elements on the layer from being edited.
+Visible
+Show or hide the 
layer.
+Printable
+When printing, 
print or ignore this particular layer.
+Locked
+Prevent elements 
on the layer from being edited.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-04-24 Thread Caolán McNamara 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ae385e8e7cec0b357679e39100eb4c03bf851db
Author: Caolán McNamara 
Date:   Wed Apr 24 16:05:32 2013 +0100

Updated core
Project: help  1909db99ab7d23a71e24bac25693b3a22d73bfa3

diff --git a/helpcontent2 b/helpcontent2
index e6fede8..1909db9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e6fede848bb18f23984d5748954ed0786aa27b1f
+Subproject commit 1909db99ab7d23a71e24bac25693b3a22d73bfa3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] Add HarfBuzz support to the build system

2013-04-24 Thread Jan Holesovsky 
Hi Khaled,

Khaled Hosny píše v Ne 21. 04. 2013 v 10:51 +0200:

> I didn't know that it will submit each commit separately (git review),
> should I abandon this and the next commits and squash them into one?

No problem - better to keep the logical grouping of the commits, with
more traffic, than to push one huge blob that changes the entire
world :-)

> Also, there are some unresolved issues that I can't handle, may be
> submitting to gerrit wasn't the best idea after all.

You can have work-in-progress branches in gerrit (AKA "drafts"), if you
wish so:

https://wiki.documentfoundation.org/Development/gerrit#Submitting_patches_as_drafts

This might be good for the stuff you are not completely sure about.

All the best,
Kendy

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

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

2013-04-24 Thread Kohei Yoshida 
 sc/source/core/data/column3.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e7d9a4de9d8d714a6ec99a6aebd4597ff7295279
Author: Kohei Yoshida 
Date:   Wed Apr 24 10:57:51 2013 -0400

We have function object for this.

Change-Id: I9021771a6d6be9980ca1c46a0b5034f84fa0d49f

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 60e4b64..e69a8cc 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -48,6 +48,7 @@
 #include "globalnames.hxx"
 #include "cellvalue.hxx"
 #include "tokenarray.hxx"
+#include "stlalgorithm.hxx"
 
 #include 
 
@@ -2058,9 +2059,7 @@ void ScColumn::RebuildFormulaGroups()
 return;
 
 // clear double groups
-for (std::vector< ColDoubleEntry *>::iterator it = maDoubles.begin();
- it != maDoubles.end(); ++it )
-delete *it;
+std::for_each(maDoubles.begin(), maDoubles.end(), 
ScDeleteObjectByPtr());
 maDoubles.clear();
 
 // clear previous groups
@@ -2186,7 +2185,6 @@ void ScColumn::RebuildFormulaGroups()
 }
 #endif
 
-
 bDirtyGroups = false;
 }
 
___
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/source sd/uiconfig sd/UIConfig_sdraw.mk

2013-04-24 Thread Caolán McNamara 
 sd/AllLangResTarget_sd.mk|1 
 sd/UIConfig_sdraw.mk |1 
 sd/source/ui/dlg/layeroptionsdlg.cxx |   62 ++
 sd/source/ui/dlg/layeroptionsdlg.src |  139 ---
 sd/source/ui/inc/layeroptionsdlg.hrc |   38 
 sd/source/ui/inc/layeroptionsdlg.hxx |   24 +-
 sd/uiconfig/sdraw/ui/insertlayer.ui  |  315 +--
 7 files changed, 197 insertions(+), 383 deletions(-)

New commits:
commit e484def6763bf94a70c3fef3c68bbef50eced67f
Author: Caolán McNamara 
Date:   Wed Apr 24 15:59:17 2013 +0100

adapt code to insert layer .ui conversion

Change-Id: I75e83c2e2399f12e7d4cd035856e5ee07a75d494

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index a5838b8..11aedef 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/inspagob.src \
 sd/source/ui/dlg/ins_paste.src \
 sd/source/ui/dlg/LayerDialog.src \
-sd/source/ui/dlg/layeroptionsdlg.src \
 sd/source/ui/dlg/masterlayoutdlg.src \
 sd/source/ui/dlg/morphdlg.src \
 sd/source/ui/dlg/navigatr.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index fc7244c..3fda04d 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
+   sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/printeroptions \
 ))
 
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx 
b/sd/source/ui/dlg/layeroptionsdlg.cxx
index df8365e..e9c56ce 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -19,56 +19,46 @@
 
 
 #include 
+#include 
 
 #include "strings.hrc"
 #include "sdattr.hxx"
 #include "sdresid.hxx"
 #include "layeroptionsdlg.hxx"
-#include "layeroptionsdlg.hrc"
 
-SdInsertLayerDlg::SdInsertLayerDlg( Window* pWindow, const SfxItemSet& 
rInAttrs, bool bDeletable, String aStr )
-: ModalDialog( pWindow, SdResId( DLG_INSERT_LAYER ) )
-, maFtName( this, SdResId( FT_NAME ) )
-, maEdtName( this, SdResId( EDT_NAME ) )
-, maFtTitle( this, SdResId( FT_TITLE ) )
-, maEdtTitle( this, SdResId( EDT_TITLE ) )
-, maFtDesc( this, SdResId( FT_DESCRIPTION ) )
-, maEdtDesc( this, SdResId( EDT_DESCRIPTION ) )
-, maCbxVisible( this, SdResId( CBX_VISIBLE ) )
-, maCbxPrintable( this, SdResId( CBX_PRINTABLE ) )
-, maCbxLocked( this, SdResId( CBX_LOCKED ) )
-, maFixedLine( this, SdResId( FL_SEPARATOR_B ) )
-, maBtnHelp( this, SdResId( BTN_HELP ) )
-, maBtnOK( this, SdResId( BTN_OK ) )
-, maBtnCancel( this, SdResId( BTN_CANCEL ) )
-, mrOutAttrs( rInAttrs )
+SdInsertLayerDlg::SdInsertLayerDlg( Window* pWindow, const SfxItemSet& 
rInAttrs,
+bool bDeletable, const OUString& rStr )
+: ModalDialog(pWindow, "InsertLayerDialog", 
"modules/sdraw/ui/insertlayer.ui")
+, mrOutAttrs(rInAttrs)
 {
-FreeResource();
+SetText(rStr);
 
-SetText( aStr );
+get(m_pEdtName, "name");
+get(m_pEdtTitle, "title");
+get(m_pEdtDesc, "textview");
+get(m_pCbxVisible, "visible");
+get(m_pCbxPrintable, "printable");
+get(m_pCbxLocked, "locked");
 
-maEdtName.SetText( ( ( const SdAttrLayerName& ) mrOutAttrs.Get( 
ATTR_LAYER_NAME ) ).GetValue() );
-maEdtTitle.SetText( ( ( const SdAttrLayerTitle& ) mrOutAttrs.Get( 
ATTR_LAYER_TITLE ) ).GetValue() );
-maEdtDesc.SetText( ( ( const SdAttrLayerDesc& ) mrOutAttrs.Get( 
ATTR_LAYER_DESC ) ).GetValue() );
-maCbxVisible.Check( ( ( const SdAttrLayerVisible& ) mrOutAttrs.Get( 
ATTR_LAYER_VISIBLE ) ).GetValue() );
-maCbxPrintable.Check( ( ( const SdAttrLayerPrintable& ) mrOutAttrs.Get( 
ATTR_LAYER_PRINTABLE ) ).GetValue() );
-maCbxLocked.Check( ( ( const SdAttrLayerLocked& ) mrOutAttrs.Get( 
ATTR_LAYER_LOCKED ) ).GetValue() );
+m_pEdtName->SetText( ( ( const SdAttrLayerName& ) mrOutAttrs.Get( 
ATTR_LAYER_NAME ) ).GetValue() );
+m_pEdtTitle->SetText( ( ( const SdAttrLayerTitle& ) mrOutAttrs.Get( 
ATTR_LAYER_TITLE ) ).GetValue() );
+m_pEdtDesc->SetText( ( ( const SdAttrLayerDesc& ) mrOutAttrs.Get( 
ATTR_LAYER_DESC ) ).GetValue() );
+m_pEdtDesc->set_height_request(4 * m_pEdtDesc->GetTextHeight());
+m_pCbxVisible->Check( ( ( const SdAttrLayerVisible& ) mrOutAttrs.Get( 
ATTR_LAYER_VISIBLE ) ).GetValue() );
+m_pCbxPrintable->Check( ( ( const SdAttrLayerPrintable& ) mrOutAttrs.Get( 
ATTR_LAYER_PRINTABLE ) ).GetValue() );
+m_pCbxLocked->Check( ( ( const SdAttrLayerLocked& ) mrOutAttrs.Get( 
ATTR_LAYER_LOCKED ) ).GetValue() );
 
-if( !bDeletable )
-{
-maFtName.Disable();
-maEdtName.Disable();
-}
+get("nameframe")->Enable(bDeletable);
 }
 
 void SdInsertLayerDlg::GetAttr( SfxItemSet& rAttrs )
 {
-rAttrs.Put( SdAttrLayerName( maEdtName.GetText() ) );
-rAttrs.Put( SdAttrLayerTitle( maEdtTitle.GetText() ) );
-rAttrs.Put( SdAttrLayerDesc( maEdtDesc.GetText(

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

2013-04-24 Thread Stephan Bergmann 
 solenv/gbuild/InternalUnoApi.mk |1 +
 solenv/gbuild/UnoApi.mk |1 +
 solenv/gbuild/UnoApiTarget.mk   |   22 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit d995207e9705e66c6cb781bbb63fa79e362d8b29
Author: Stephan Bergmann 
Date:   Wed Apr 24 16:42:23 2013 +0200

Generate new format type rdb files

With the main components (theTypeDescriptionManager, codemakers) supporting 
the
new unoidl format, it is time to switch the generated type rdb files to 
that new
format.

For now, this is done as a two-stage process, though:  Every
$(WORKDIR)/UnoApiTarget/*.rdb file in the new format is accompanied by an
*.rdb.oldformat file; both are generated in the same [UNO] gbuild step.  
This is
for several reasons:

* idlc still generates old format output.

* The regcompare step (comparing against a reference rdb to catch
  incompatible changes) is still based on the old format.

(The reg2unoidl tool needs any dependend rdbs as additional inputs, that's 
why
the use_api information needs to be tracked as UNOAPI_DEPRDBS for now.  
That can
be removed again when reg2unoidl is no longer used.)

Change-Id: Id625c88f9ecdbaba9e2af7410417e00b4ba36acc

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index cd94369..dabcdf5 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,6 +52,7 @@ $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
 endef
 
 define gb_InternalUnoApi__use_api
+$(call gb_UnoApiTarget_use_api,$(1),$(2))
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_InternalUnoApi_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(2))
 $(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index b5eeb5f..4807c32 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -190,6 +190,7 @@ $(call gb_UnoApi__add_docfiles,$(1),$(2),$(3))
 endef
 
 define gb_UnoApi__use_api
+$(call gb_UnoApiTarget_use_api,$(1),$(2))
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
 $(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 8beba2d..0cf7ff6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -85,15 +85,19 @@ endif
 
 gb_UnoApiTarget_REGCOMPAREDEPS := $(call 
gb_Executable_get_runtime_dependencies,regcompare)
 gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin 
$(call gb_Executable_get_command,regcompare)
-gb_UnoApiTarget_REGMERGEDEPS := $(call 
gb_Executable_get_runtime_dependencies,regmerge)
+gb_UnoApiTarget_REGMERGEDEPS := $(call 
gb_Executable_get_runtime_dependencies,regmerge) $(call 
gb_Executable_get_runtime_dependencies,reg2unoidl)
 gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call 
gb_Executable_get_command,regmerge)
 
 gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types)
 
 define gb_UnoApiTarget__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1) $(2) $(3)) && \
+RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(1).oldformat $(2) 
$(3)) && \
 $(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE}
+rm -f $${RESPONSEFILE} && \
+SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin \
+   $(call gb_Executable_get_command,reg2unoidl) \
+   $(foreach rdb,$(4),$(call gb_UnoApiTarget_get_target,$(rdb))) \
+   $(1).oldformat $(1)
 endef
 
 # first delete target rdb file to detect problems when removing IDL files
@@ -101,13 +105,13 @@ define gb_UnoApiTarget__command
 $(call gb_Output_announce,$(2),$(true),UNO,4)
 mkdir -p $(dir $(1)) && \
 rm -f $(1) && \
-$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)) \
+$(call 
gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES),$(UNOAPI_DEPRDBS))
 \
 $(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
&& $(gb_UnoApiTarget_REGCOMPARECOMMAND) \
-f -t \
-r1 $(UNOAPI_REFERENCE) \
-   -r2 $(1))
+   -r2 $(1).oldformat)
 endef
 
 define gb_UnoApiTarget__check_mode
@@ -130,6 +134,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*) \
+   $(call gb_UnoApiTarget_get_target,$*).oldformat \
$(call gb_UnoApiTarget_get_external_headers_target,$*) \
$(call gb_UnoApiTarget_get_headers_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
@

[Libreoffice-commits] libmspub.git: 2 commits - src/lib

2013-04-24 Thread Franz Schmid 
 src/lib/MSPUBCollector.cpp|6 +++---
 src/lib/MSPUBSVGGenerator.cpp |   35 +++
 2 files changed, 26 insertions(+), 15 deletions(-)

New commits:
commit b4c7fe03433a0db5a625e76fa7fa81e4a41f85c6
Author: Franz Schmid 
Date:   Fri Apr 19 20:49:01 2013 +0200

First Line left indent is signed not unsigned.

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 4af4969..a8d55ca 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1167,8 +1167,8 @@ WPXPropertyList 
libmspub::MSPUBCollector::getParaStyleProps(const ParagraphStyle
  defaultStyle.m_spaceAfterEmu.get_value_or(0));
   unsigned spaceBeforeEmu = style.m_spaceBeforeEmu.get_value_or(
   defaultStyle.m_spaceBeforeEmu.get_value_or(0));
-  unsigned firstLineIndentEmu = style.m_firstLineIndentEmu.get_value_or(
-  
defaultStyle.m_firstLineIndentEmu.get_value_or(0));
+  int firstLineIndentEmu = style.m_firstLineIndentEmu.get_value_or(
+ 
defaultStyle.m_firstLineIndentEmu.get_value_or(0));
   unsigned leftIndentEmu = style.m_leftIndentEmu.get_value_or(
  defaultStyle.m_leftIndentEmu.get_value_or(0));
   unsigned rightIndentEmu = style.m_rightIndentEmu.get_value_or(
commit 826cb95f46f0853bfaec885ca2b9f8b88f036771
Author: Franz Schmid 
Date:   Wed Apr 17 22:48:01 2013 +0200

Fixed crash when converting files with dashed lines to svg.

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 895b736..4af4969 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -743,7 +743,7 @@ boost::function 
libmspub::MSPUBCollector::paintShape(const ShapeInfo
   graphicsProps.insert("svg:stroke-linecap", "round");
   break;
 case RECT_DOT:
-  graphicsProps.insert("svg:stroke-linecap", "rect");
+  graphicsProps.insert("svg:stroke-linecap", "butt");
   break;
 default:
   break;
diff --git a/src/lib/MSPUBSVGGenerator.cpp b/src/lib/MSPUBSVGGenerator.cpp
index 7546230..4b5482f 100644
--- a/src/lib/MSPUBSVGGenerator.cpp
+++ b/src/lib/MSPUBSVGGenerator.cpp
@@ -546,9 +546,10 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /* 
isClosed */)
 {
   m_outputSink << "style=\"";
 
+  double width = 1.0 / 72.0;
   if (m_style["svg:stroke-width"])
   {
-double width = m_style["svg:stroke-width"]->getDouble();
+width = m_style["svg:stroke-width"]->getDouble();
 if (width == 0.0 && m_style["draw:stroke"] && 
m_style["draw:stroke"]->getStr() != "none")
   width = 0.2 / 72.0; // reasonable hairline
 m_outputSink << "stroke-width: " << doubleToString(72*width) << "; ";
@@ -562,29 +563,39 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /* 
isClosed */)
   }
 
   if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "solid")
-m_outputSink << "stroke-dasharray:  solid; ";
-  else if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == 
"dash")
+m_outputSink << "stroke-dasharray:  none; ";
+  if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "dash")
   {
-int dots1 = m_style["draw:dots1"]->getInt();
-int dots2 = m_style["draw:dots2"]->getInt();
-double dots1len = m_style["draw:dots1-length"]->getDouble();
-double dots2len = m_style["draw:dots2-length"]->getDouble();
-double gap = m_style["draw:distance"]->getDouble();
+int dots1 = 0;
+if (m_style["draw:dots1"])
+  dots1 = m_style["draw:dots1"]->getInt();
+int dots2 = 0;
+if (m_style["draw:dots2"])
+  dots2 = m_style["draw:dots2"]->getInt();
+double dots1len = width * 72.0;
+double dots2len = width * 72.0;
+double gap = width * 72.0;
+if (m_style["draw:dots1-length"])
+  dots1len = m_style["draw:dots1-length"]->getDouble() * 72.0;
+if (m_style["draw:dots2-length"])
+  dots2len = m_style["draw:dots2-length"]->getDouble() * 72.0;
+if (m_style["draw:distance"])
+  gap = m_style["draw:distance"]->getDouble() * 72.0;
 m_outputSink << "stroke-dasharray: ";
 for (int i = 0; i < dots1; i++)
 {
   if (i)
 m_outputSink << ", ";
-  m_outputSink << (int)dots1len;
+  m_outputSink << dots1len;
   m_outputSink << ", ";
-  m_outputSink << (int)gap;
+  m_outputSink << gap;
 }
 for (int j = 0; j < dots2; j++)
 {
   m_outputSink << ", ";
-  m_outputSink << (int)dots2len;
+  m_outputSink << dots2len;
   m_outputSink << ", ";
-  m_outputSink << (int)gap;
+  m_outputSink << gap;
 }
 m_outputSink << "; ";
   }
___
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

2013-04-24 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 59259, which changed state.

Bug 59259 Summary: With some master pages, freezes when try to print
https://bugs.freedesktop.org/show_bug.cgi?id=59259

   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

[PUSHED] insertlayer.ui widget

2013-04-24 Thread via Code Review 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3514

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved

Objections:
  Noel Grandin: This need some tweaks before it is merged


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida59f58f6a2c4f65d83ad5ed2375bf934bd81d0c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Noel Grandin 

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

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

2013-04-24 Thread Jan Holesovsky 
 vcl/source/gdi/outdev.cxx  |9 -
 vcl/source/gdi/outdev6.cxx |3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f650b3a50c1490f3773003f5bcdf2fdebe0beb12
Author: Jan Holesovsky 
Date:   Wed Apr 24 16:19:56 2013 +0200

More places where we can suppress output.

Change-Id: Ib316bf40bb9b9afeb5fbdf9281f2d3b9539e346f

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 2872262..f134388 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2064,8 +2064,8 @@ void OutputDevice::DrawPolyPolygon( const 
basegfx::B2DPolyPolygon& rB2DPolyPoly
 
 void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const 
basegfx::B2DPolyPolygon& rB2DPolyPoly)
 {
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolyPoly.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolyPoly.count() || !IsDeviceOutputNecessary())
 return;
 
 // we need a graphics
@@ -2192,9 +2192,8 @@ void OutputDevice::DrawPolyLine(
 mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, 
aLineInfo ) );
 }
 
-
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolygon.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolygon.count() || !IsDeviceOutputNecessary())
 return;
 
 // we need a graphics
commit 617a6258d63d7f2307f38322a411670e6ed8
Author: Jan Holesovsky 
Date:   Wed Apr 24 16:15:19 2013 +0200

fdo#59259: Suppress the expensive parts when we are only writing to 
metafile.

When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile.  Unfortunately, 
here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.

The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.

Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12

diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 4297e48..c855049 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -612,6 +612,9 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& 
rMtf, const Point& rPos,
 mpMetaFile->AddAction( new MetaFloatTransparentAction( rMtf, rPos, 
rSize, rTransparenceGradient ) );
 }
 
+if ( !IsDeviceOutputNecessary() )
+return;
+
 if( ( rTransparenceGradient.GetStartColor() == aBlack && 
rTransparenceGradient.GetEndColor() == aBlack ) ||
 ( mnDrawMode & ( DRAWMODE_NOTRANSPARENCY ) ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Alia Almusaireae 
 sd/uiconfig/sdraw/ui/insertlayer.ui |  269 
 1 file changed, 269 insertions(+)

New commits:
commit 5ca26caf2ca723c9857b563568dae8a16c9c5962
Author: Alia Almusaireae 
Date:   Sun Apr 21 10:28:04 2013 +0300

insertlayer.ui widget

Change-Id: Ida59f58f6a2c4f65d83ad5ed2375bf934bd81d0c
Reviewed-on: https://gerrit.libreoffice.org/3514
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui 
b/sd/uiconfig/sdraw/ui/insertlayer.ui
new file mode 100644
index 000..a53d72d
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/insertlayer.ui
@@ -0,0 +1,269 @@
+
+
+  
+  
+False
+6
+Insert Layer
+dialog
+
+  
+False
+vertical
+2
+
+  
+False
+start
+
+  
+gtk-help
+True
+True
+True
+False
+True
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-ok
+True
+True
+True
+True
+False
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+False
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+True
+●
+True
+  
+
+  
+
+
+  
+True
+False
+_Name
+True
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+True
+●
+True
+  
+
+  
+
+
+  
+True
+False
+_Title
+True
+True
+  
+
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+
+  
+True
+True
+●
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+vertical
+  
+  
+False
+True
+1
+  
+
+  
+
+  
+
+
+  
+True
+False
+_Description
+True
+True
+  
+
+  
+  
+False
+True
+3
+  
+
+
+  
+_Visible
+True
+True
+False
+False
+True
+0
+True
+  
+  
+False
+True
+4
+  
+
+
+  
+_Printable
+True
+True
+False
+False
+True
+0

[PATCH 4-0] Pushed by mistake, searching for approval now

2013-04-24 Thread Jan Holesovsky 
Hi,

By mistake, I have pushed:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0&id=0b39358aaf723b26b5effb7245f38ad960cc609a

and

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0&id=1035150cea85678075583deda612dde52867c125

Can anybody here approve it, please? :-)

I'll revert if there are any concerns; just prefer to avoid commit -
revert - commit if possible...

Thank you a lot,
Kendy

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

Re: Empty Advanced options page on Windows

2013-04-24 Thread Thomas Arnhold 

On 23.04.2013 16:40, Caolán McNamara wrote:

On Wed, 2013-04-17 at 08:49 -0400, Kohei Yoshida wrote:

Hi there,


I just completed my Windows build of the master branch and noticed
that, the Advanced options page is for some reason totally blank.  If
my attachment goes through, you can see it in the attached screenshot.


Does this ring any bell to anyone?


No, but java options are in there aren't they ? I wonder if the same
thing would happen on Linux if no JREs are detected to list in it ?


On Linux with no JRE installed it works. The list is just empty.

Thomas

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

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

2013-04-24 Thread Jan Holesovsky 
 vcl/source/gdi/outdev.cxx  |9 -
 vcl/source/gdi/outdev6.cxx |3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 1035150cea85678075583deda612dde52867c125
Author: Jan Holesovsky 
Date:   Wed Apr 24 16:19:56 2013 +0200

More places where we can suppress output.

Change-Id: Ib316bf40bb9b9afeb5fbdf9281f2d3b9539e346f

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index d34cea9..2f4cf0c 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2175,8 +2175,8 @@ void OutputDevice::DrawPolyPolygon( const 
basegfx::B2DPolyPolygon& rB2DPolyPoly
 
 void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const 
basegfx::B2DPolyPolygon& rB2DPolyPoly)
 {
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolyPoly.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolyPoly.count() || !IsDeviceOutputNecessary())
 return;
 
 // we need a graphics
@@ -2306,9 +2306,8 @@ void OutputDevice::DrawPolyLine(
 mpMetaFile->AddAction( new MetaPolyLineAction( aToolsPolygon, 
aLineInfo ) );
 }
 
-
-// AW: Do NOT paint empty PolyPolygons
-if(!rB2DPolygon.count())
+// Do not paint empty PolyPolygons
+if(!rB2DPolygon.count() || !IsDeviceOutputNecessary())
 return;
 
 // we need a graphics
commit 0b39358aaf723b26b5effb7245f38ad960cc609a
Author: Jan Holesovsky 
Date:   Wed Apr 24 16:15:19 2013 +0200

fdo#59259: Suppress the expensive parts when we are only writing to 
metafile.

When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile.  Unfortunately, 
here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.

The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.

Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12

diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 46eb689..85f6ce5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -614,6 +614,9 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& 
rMtf, const Point& rPos,
 if( mpMetaFile )
 mpMetaFile->AddAction( new MetaFloatTransparentAction( rMtf, rPos, 
rSize, rTransparenceGradient ) );
 
+if ( !IsDeviceOutputNecessary() )
+return;
+
 if( ( rTransparenceGradient.GetStartColor() == aBlack && 
rTransparenceGradient.GetEndColor() == aBlack ) ||
 ( mnDrawMode & ( DRAWMODE_NOTRANSPARENCY ) ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] inserttable.ui widget

2013-04-24 Thread via Code Review 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3513

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved

Objections:
  Noel Grandin: This need some tweaks before it is merged


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9de1975b5eeda09e3f356d20c05a2d8f6ebdcfc1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Noel Grandin 

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

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

2013-04-24 Thread Caolán McNamara 
 sd/uiconfig/sdraw/ui/inserttable.ui |  174 
 1 file changed, 174 deletions(-)

New commits:
commit cf26e3cec8dd899e60fd52b6f0dadcc8fba91f10
Author: Caolán McNamara 
Date:   Wed Apr 24 15:18:50 2013 +0100

actually insert table is already converted

Change-Id: I67e332a3033f142d843e0146aa1ac0b27c8f7db1

diff --git a/sd/uiconfig/sdraw/ui/inserttable.ui 
b/sd/uiconfig/sdraw/ui/inserttable.ui
deleted file mode 100644
index 52a7afd..000
--- a/sd/uiconfig/sdraw/ui/inserttable.ui
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-  
-  
-False
-6
-Insert Table
-dialog
-
-  
-False
-vertical
-2
-
-  
-True
-False
-
-  
-True
-False
-Number of 
_rows:
-True
-  
-  
-0
-1
-1
-1
-  
-
-
-  
-True
-True
-●
-True
-  
-  
-1
-0
-1
-1
-  
-
-
-  
-True
-True
-●
-True
-  
-  
-1
-1
-1
-1
-  
-
-
-  
-True
-False
-_Number of 
columns:
-True
-  
-  
-0
-0
-1
-1
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-  
-  
-False
-True
-0
-  
-
-
-  
-False
-start
-
-  
-gtk-help
-True
-True
-True
-False
-True
-top
-  
-  
-False
-True
-0
-  
-
-
-  
-gtk-ok
-True
-True
-True
-True
-False
-True
-  
-  
-False
-True
-1
-  
-
-
-  
-gtk-cancel
-True
-True
-True
-False
-True
-  
-  
-False
-True
-2
-  
-
-  
-  
-False
-True
-end
-0
-  
-
-
-  
-True
-False
-  
-  
-False
-True
-2
-  
-
-  
-
-
-  help1
-  ok1
-  cancel1
-
-  
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Alia Almusaireae 
 sd/uiconfig/sdraw/ui/inserttable.ui |  174 
 1 file changed, 174 insertions(+)

New commits:
commit 7ef4f7fbdcc7c0bdf4e949b4a369d029a3350a85
Author: Alia Almusaireae 
Date:   Sun Apr 21 10:25:03 2013 +0300

inserttable.ui widget

Change-Id: I9de1975b5eeda09e3f356d20c05a2d8f6ebdcfc1
Reviewed-on: https://gerrit.libreoffice.org/3513
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/uiconfig/sdraw/ui/inserttable.ui 
b/sd/uiconfig/sdraw/ui/inserttable.ui
new file mode 100644
index 000..52a7afd
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/inserttable.ui
@@ -0,0 +1,174 @@
+
+
+  
+  
+False
+6
+Insert Table
+dialog
+
+  
+False
+vertical
+2
+
+  
+True
+False
+
+  
+True
+False
+Number of 
_rows:
+True
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+True
+●
+True
+  
+  
+1
+0
+1
+1
+  
+
+
+  
+True
+True
+●
+True
+  
+  
+1
+1
+1
+1
+  
+
+
+  
+True
+False
+_Number of 
columns:
+True
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+False
+start
+
+  
+gtk-help
+True
+True
+True
+False
+True
+top
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-ok
+True
+True
+True
+True
+False
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+False
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+  
+  
+False
+True
+2
+  
+
+  
+
+
+  help1
+  ok1
+  cancel1
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Caolán McNamara 
 helpers/help_hid.lst|1 -
 source/text/shared/guide/collab.xhp |3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e6fede848bb18f23984d5748954ed0786aa27b1f
Author: Caolán McNamara 
Date:   Wed Apr 24 15:12:45 2013 +0100

update help ids for share document ui conversion

Change-Id: Ib86dcbb71ed7ff7f62f57a5655c32c6b1f3d47a5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 07ed438..5b3aeda 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6500,7 +6500,6 @@ 
sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW,2567504924,
 sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305,
 sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721,
 sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105,
-sc_CheckBox_RID_SCDLG_SHAREDOCUMENT_CB_SHARE,1495598081,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_CASE,2567095298,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_COPY_RESULT,2567095301,
 sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308,
diff --git a/source/text/shared/guide/collab.xhp 
b/source/text/shared/guide/collab.xhp
index 9504550..accd82f 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -33,8 +33,9 @@
 Collaboration
 In 
%PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any 
document for writing. In Calc, many users can open the same spreadsheet for 
writing at the same time.Tools - Share Document 
menu
 
+
 Opens the Share Document dialog where you can enable or 
disable collaborative sharing of the 
document.Share Document dialog - Share this 
spreadsheet with other users
-
+
 Enable to share the current document with other users. 
Disable to use the document unshared. This will invalidate the not yet saved 
edits that other users applied in the time since you last opened or saved this 
document.
 Collaboration in Calc
 In 
%PRODUCTNAME Calc, document sharing allows simultaneous write access for many 
users. Every user who wants to collaborate should enter a name on the 
%PRODUCTNAME - 
Preferences
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-04-24 Thread Caolán McNamara 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24136332e1b6fef3ca63b1e2137e6377ff766638
Author: Caolán McNamara 
Date:   Wed Apr 24 15:12:45 2013 +0100

Updated core
Project: help  e6fede848bb18f23984d5748954ed0786aa27b1f

diff --git a/helpcontent2 b/helpcontent2
index 2057fbe..e6fede8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2057fbeeeab78144913ded4b662d14db7e64f8ff
+Subproject commit e6fede848bb18f23984d5748954ed0786aa27b1f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix fdo#60910 FILESAVE loses fontwork/shape objects

2013-04-24 Thread Luke Deller (via Code Review) 
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3596

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/3596/1

fix fdo#60910 FILESAVE loses fontwork/shape objects

This reinstates one line of code which was removed by
7fec8dfcaca4efc92516f9af51a3157f1a11ccd7.

Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
---
M svx/source/svdraw/svdoashp.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 67bd0a5..fd0c5c8 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3217,6 +3217,7 @@
 void SdrObjCustomShape::InvalidateRenderGeometry()
 {
 mXRenderedCustomShape = 0L;
+mxCustomShapeEngine = 0L;
 SdrObject::Free( mpLastShadowGeometry );
 mpLastShadowGeometry = 0L;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2af33914d17a46b7118b8b804aadc0aa3bc5d90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luke Deller 

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

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

2013-04-24 Thread Caolán McNamara 
 sc/AllLangResTarget_sc.mk|1 
 sc/UIConfig_scalc.mk |1 
 sc/source/ui/inc/sharedocdlg.hrc |   38 ---
 sc/source/ui/inc/sharedocdlg.hxx |   21 --
 sc/source/ui/miscdlgs/sharedocdlg.cxx|  110 +++
 sc/source/ui/miscdlgs/sharedocdlg.src|  105 --
 sc/uiconfig/scalc/ui/sharedocumentdlg.ui |  301 ---
 7 files changed, 243 insertions(+), 334 deletions(-)

New commits:
commit 08cc155303542defc377e714d977c58f30df9a17
Author: Caolán McNamara 
Date:   Wed Apr 24 13:08:32 2013 +0100

adapt code to use converted share doument widget

Change-Id: Ic553e593890cb3254666e3c27c5d8ca05256687e

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 9d487f6..c25cc42 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/miscdlgs/conflictsdlg.src \
 sc/source/ui/miscdlgs/protectiondlg.src \
 sc/source/ui/miscdlgs/acredlin.src \
-sc/source/ui/miscdlgs/sharedocdlg.src \
 sc/source/ui/formdlg/formdlgs.src \
 sc/source/ui/formdlg/dwfunctr.src \
 sc/source/core/src/compiler.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index ef7e819..89ad302 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \
sc/uiconfig/scalc/ui/selectsource \
+   sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/solverdlg \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc
deleted file mode 100644
index 7be210d..000
--- a/sc/source/ui/inc/sharedocdlg.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-
-#define CB_SHARE1
-#define FT_WARNING  2
-#define FL_USERS3
-#define FT_USERS4
-#define LB_USERS5
-#define FL_END  6
-#define BTN_HELP7
-#define BTN_OK  8
-#define BTN_CANCEL  9
-
-#define STR_TITLE_NAME  1
-#define STR_TITLE_ACCESSED  2
-#define STR_NO_USER_DATA3
-#define STR_UNKNOWN_USER4
-#define STR_EXCLUSIVE_ACCESS5
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index f958c5d..f0760e2 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -36,22 +36,13 @@ class ScDocShell;
 class ScShareDocumentDlg : public ModalDialog
 {
 private:
-CheckBoxmaCbShare;
-FixedText   maFtWarning;
-FixedLine   maFlUsers;
-FixedText   maFtUsers;
-SvxSimpleTableContainer m_aLbUsersContainer;
-SvxSimpleTable  maLbUsers;
-FixedLine   maFlEnd;
-HelpButton  maBtnHelp;
-OKButtonmaBtnOK;
-CancelButtonmaBtnCancel;
+CheckBox*   m_pCbShare;
+FixedText*  m_pFtWarning;
+SvxSimpleTable* m_pLbUsers;
 
-String  maStrTitleName;
-String  maStrTitleAccessed;
-String  maStrNoUserData;
-String  maStrUnkownUser;
-String  maStrExclusiveAccess;
+OUStringm_aStrNoUserData;
+OUStringm_aStrUnknownUser;
+OUStringm_aStrExclusiveAccess;
 
 ScViewData* mpViewData;
 ScDocShell* mpDocShell;
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx 
b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 86fc0a5..af56056 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -28,7 +28,6 @@
 
 
 #include "sharedocdlg.hxx"
-#include "sharedocdlg.hrc"
 #include "scresid.hxx"
 #include "docsh.hxx"
 #include "viewdata.hxx"
@@ -36,

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

2013-04-24 Thread Tor Lillqvist 
 reportdesign/source/ui/misc/RptUndo.cxx|4 ++--
 reportdesign/source/ui/report/ReportController.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10bd0604194db9e42fe76adab4ca17a6c7d0ac7c
Author: Tor Lillqvist 
Date:   Wed Apr 24 16:41:09 2013 +0300

Fix MSVC build: A ? : operator doesn't automagically construct an OUString

Change-Id: I0bf2dcd24a7b59682c90a8910279117f1bf0467f

diff --git a/reportdesign/source/ui/misc/RptUndo.cxx 
b/reportdesign/source/ui/misc/RptUndo.cxx
index 6a28072..82ed522 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -299,7 +299,7 @@ void OGroupSectionUndo::implReInsert( )
 {
 uno::Sequence< beans::PropertyValue > aArgs(2);
 
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON 
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
 aArgs[0].Value <<= sal_True;
 aArgs[1].Name = PROPERTY_GROUP;
 aArgs[1].Value <<= m_aGroupHelper.getGroup();
@@ -318,7 +318,7 @@ void OGroupSectionUndo::implReRemove( )
 
 uno::Sequence< beans::PropertyValue > aArgs(2);
 
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON 
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
 aArgs[0].Value <<= sal_False;
 aArgs[1].Name = PROPERTY_GROUP;
 aArgs[1].Value <<= m_aGroupHelper.getGroup();
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index bd4fde8..27c76ab 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3900,7 +3900,7 @@ void OReportController::createGroupSection(const bool 
_bUndo,const bool _bHeader
 if ( m_xReportDefinition.is() )
 {
 const SequenceAsHashMap aMap(_aArgs);
-const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? 
PROPERTY_HEADERON : PROPERTY_FOOTERON,sal_False);
+const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False);
 uno::Reference< report::XGroup> xGroup = 
aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< 
report::XGroup>());
 if ( xGroup.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bugs that need triaged ASAP - Potential Regressions within Release

2013-04-24 Thread Stephan Bergmann 

On 04/23/2013 09:56 PM, Joel Madero wrote:

This is a list of bugs that get highest priority for getting triaged[1].
This will help us tremendously.

[...]

[1]
https://bugs.freedesktop.org/report.cgi?x_axis_field=resolution&y_axis_field=version&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&product=LibreOffice&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=---&resolution=FIXED&resolution=INVALID&resolution=WONTFIX&resolution=DUPLICATE&resolution=WORKSFORME&resolution=MOVED&resolution=NOTABUG&resolution=NOTOURBUG&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=regression%2C+&bug_id=&bug_id_type=anyexact&emailtype1=substring&email1=&emailtype2=substring&email2=&emailtype3=substring&email3=&chfieldvalue=&chfieldfrom=&chfieldto=Now&j_top=AND&f1=version&o1=substring&v1=3.6.&f2=version&o2=nowordssubstr&v2=3.6.0&f3=status_whiteboard&o3=notsubstring&v3=&f4=noop&o4=noop&v4=&f5=noop&o5=noop&v5=&format=ta!

ble&action
=wrap

That link leads to some fancy table with numbers, but nothing that can 
be scanned quickly for bug titles where a developer might say "hm, that 
sounds like I might know something about it, lets see."


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

[Libreoffice-commits] core.git: 2 commits - odk/CustomTarget_check.mk odk/CustomTarget_classes.mk odk/CustomTarget_doxygen.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Zip_cppdocs.mk odk/Zip

2013-04-24 Thread David Tardon 
 odk/CustomTarget_check.mk  |4 ++--
 odk/CustomTarget_classes.mk|   13 ++---
 odk/CustomTarget_doxygen.mk|   30 +++---
 odk/CustomTarget_odkcommon.mk  |   21 -
 odk/Module_odk.mk  |7 ---
 odk/Zip_cppdocs.mk |2 +-
 odk/Zip_odkcommon.mk   |   23 ---
 scp2/source/sdkoo/module_sdkoo.scp |4 ++--
 scp2/source/sdkoo/sdkoo.scp|   16 +---
 9 files changed, 39 insertions(+), 81 deletions(-)

New commits:
commit c93a752ae77f5c03b61c29a2b05dd9580f181400
Author: David Tardon 
Date:   Wed Apr 24 15:20:51 2013 +0200

ritually kill odkcommon.zip

Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a5995fc..ab515c9 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -45,8 +45,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
-   $(call gb_PackageSet_get_target,odk_autodoc) \
-   $(call gb_CustomTarget_get_target,odk/odkcommon)
+   $(call gb_PackageSet_get_target,odk_autodoc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
$(PERL) $< \
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index f813bcc..82f5247 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
 ))
 
-$(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call 
gb_JavaClassSet_get_target,loader)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
touch $@
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index e9a33ee..bddb0f3 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp))
 
 CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
@@ -28,25 +28,33 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
 DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox 
$(SRCDIR)/include/sal/log-areas.dox \
$(addprefix 
$(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) 
$(odk_INCFILELIST))
 DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u 
$(DOXY_INPUT)),$(DOXY_INPUT))
-DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u 
$(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref)
+DOXY_WORKDIR := $(if $(filter WNT,$(OS)),\
+   $(shell cygpath -u $(call 
gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref),\
+   $(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/ref)
 DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u 
$(OUTDIR)/inc),$(OUTDIR)/inc)
-DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
-   $(SRCDIR)/odk/pack/gendocu/main.dox \
-   $(SRCDIR)/include/sal/log-areas.dox \
-   $(call gb_PackageSet_get_target,odk_headers)
 
 
-$(eval $(call 
gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
+$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/docs/cpp,\
+   Doxyfile \
+   doxygen.log \
+))
 
-$(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile : 
$(SRCDIR)/odk/pack/gendocu/Doxyfile
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \
-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = 
$(DOXY_WORKDIR)!' \
-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
-e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = 
$(DOXY_STRIP_PATH)!' \
-   $< > $(odk_WORKDIR)/Doxyfile && \
-   $(DOXYGEN) $(odk_WORKDIR)/Doxyfile > $(odk_WORKDIR)/doxygen.log
+   $< > $@
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/doxygen.log : \
+   $(call 
gb_CustomTarget_get_workdir,odk/odkcommon/docs/cpp)/Doxyfile \
+   $(SRCDI

Re: lots of warnings after header changes

2013-04-24 Thread Tor Lillqvist 
Already done.

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

Re: lots of warnings after header changes

2013-04-24 Thread Jonathan Aquilina 
What would be the necessary steps for one to take to remove them and start
that cleanup?



On Wed, Apr 24, 2013 at 2:47 PM, David Tardon  wrote:

> Hi,
>
> On Wed, Apr 24, 2013 at 06:49:30AM +0200, Jonathan Aquilina wrote:
> > Hey guys im building master on mac and im getting alot of warnings
> >
> > Jonathan-Aquilinas-iMac:core eagles051387$ time make
> > /usr/bin/make -j 4 -rs -f /Users/eagles051387/core/Makefile.gbuild
> > /Users/eagles051387/core/basebmp/Library_basebmp.mk:27:
> > [WARN  ] !!!
> > [WARN  ] !!! gb_LinkTarget_set_include: include paths
> > /Users/eagles051387/core/basebmp/inc/ do not exist
> >
> > are these something to worry about?
>
> No, they are harmless. I put that check in so we can find and drop them,
> to keep the makefiles clean.
>
> D.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

Re: Improvements in text formatting inside comments?

2013-04-24 Thread Caolán McNamara 
On Wed, 2013-04-24 at 00:54 +0530, Sameer Deshmukh wrote:
> Hello all,
> 
> I was going through this GSoC idea:
> https://wiki.documentfoundation.org/Development/GSoC/Ideas#Comments_improvements
> 
> I completely agree that the printing of comments at the bottom of the
> document/page is an issue, since I am also affected by it.
> 
> But can someone please  elaborate on 'basic formatting of the text
> inside the comment'?

I wonder if that is out of date. There was a time that comments were
plain text, now they are rich text with plenty of formatting options. I
suspect that issue is long fixed.

C.


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

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

2013-04-24 Thread Stephan Bergmann 
 unoidl/source/reg2unoidl.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d7186fe43618eeb9082c34a65ccb303f7bbc770d
Author: Stephan Bergmann 
Date:   Wed Apr 24 15:16:31 2013 +0200

Copy/paste error

Change-Id: I0c6e0ecc5c9e6289a2afe733d4752351416900a8

diff --git a/unoidl/source/reg2unoidl.cxx b/unoidl/source/reg2unoidl.cxx
index 0f0b53e..a311147 100644
--- a/unoidl/source/reg2unoidl.cxx
+++ b/unoidl/source/reg2unoidl.cxx
@@ -150,10 +150,10 @@ void write64(osl::File & file, sal_uInt64 value) {
 buf[1] = (value >> 8) & 0xFF;
 buf[2] = (value >> 16) & 0xFF;
 buf[3] = (value >> 24) & 0xFF;
-buf[3] = (value >> 32) & 0xFF;
-buf[3] = (value >> 40) & 0xFF;
-buf[3] = (value >> 48) & 0xFF;
-buf[3] = (value >> 56) & 0xFF;
+buf[4] = (value >> 32) & 0xFF;
+buf[5] = (value >> 40) & 0xFF;
+buf[6] = (value >> 48) & 0xFF;
+buf[7] = (value >> 56) & 0xFF;
 write(file, buf, SAL_N_ELEMENTS(buf));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Stephan Bergmann 
 i18npool/source/localedata/saxparser.cxx |   67 ++-
 1 file changed, 32 insertions(+), 35 deletions(-)

New commits:
commit 52b23b98a41aa78afa61c49179d10afee3f37643
Author: Stephan Bergmann 
Date:   Wed Apr 24 15:16:02 2013 +0200

Print message of uncaught UNO exceptions

Change-Id: I6a716efe28086da983a40c550613e3d8e0bd8283

diff --git a/i18npool/source/localedata/saxparser.cxx 
b/i18npool/source/localedata/saxparser.cxx
index 2715867..60ab16b 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -17,7 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sal/config.h"
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -296,52 +299,46 @@ public:
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
+try {
+if( argc < 4) {
+printf( "usage : %s   \n", argv[0] );
+exit( 1 );
+}
 
+Reference< XComponentContext > xContext(
+defaultBootstrap_InitialComponentContext());
 
-if( argc < 4) {
-printf( "usage : %s   \n", 
argv[0] );
-exit( 1 );
-}
-
-Reference< XComponentContext > xContext(
-defaultBootstrap_InitialComponentContext());
-
-//
-// parser demo
-// read xml from a file and count elements
-//
-Reference< XParser > rParser = Parser::create(xContext);
+//
+// parser demo
+// read xml from a file and count elements
+//
+Reference< XParser > rParser = Parser::create(xContext);
 
-int nError = 0;
-// create and connect the document handler to the parser
-TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], 
argv[3]);
+int nError = 0;
+// create and connect the document handler to the parser
+TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], 
argv[3]);
 
-Reference < XDocumentHandler >  rDocHandler( (XDocumentHandler *) 
pDocHandler );
-Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) 
pDocHandler );
+Reference < XDocumentHandler >  rDocHandler( (XDocumentHandler *) 
pDocHandler );
+Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) 
pDocHandler );
 
-rParser->setDocumentHandler( rDocHandler );
-rParser->setEntityResolver( rEntityResolver );
+rParser->setDocumentHandler( rDocHandler );
+rParser->setEntityResolver( rEntityResolver );
 
-// create the input stream
-InputSource source;
-source.aInputStream = createStreamFromFile( argv[2] );
-source.sSystemId= OUString::createFromAscii( argv[2] );
+// create the input stream
+InputSource source;
+source.aInputStream = createStreamFromFile( argv[2] );
+source.sSystemId= OUString::createFromAscii( argv[2] );
 
-try
-{
 // start parsing
 rParser->parseStream( source );
-}
 
-catch( const Exception & e )
-{
-OString o1 = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8 );
-printf( "Exception during parsing : %s\n" ,  o1.getStr() );
-exit(1);
-}
-nError = pDocHandler->nError;
+nError = pDocHandler->nError;
 
-return nError;
+return nError;
+} catch (css::uno::Exception & e) {
+std::cerr << "ERROR: " << e.Message << '\n';
+return EXIT_FAILURE;
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-24 Thread Stephan Bergmann 
 scp2/source/smoketest/smoketest.scp |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f0c5abd188641672674563fc8fa755833196bda2
Author: Stephan Bergmann 
Date:   Wed Apr 24 15:14:35 2013 +0200

Blind fix for scp2/source/smoketest/

Change-Id: I3c15ace80e0ce95910a6a256e4a25c4d7859a58c

diff --git a/scp2/source/smoketest/smoketest.scp 
b/scp2/source/smoketest/smoketest.scp
index e233a0e..e07fc77 100644
--- a/scp2/source/smoketest/smoketest.scp
+++ b/scp2/source/smoketest/smoketest.scp
@@ -155,8 +155,9 @@ End
 File gid_Test_File_Misc_TypesRdb
 TXT_FILE_BODY;
 Dir = gid_Test_Dir_Ure_Misc_Test;
-Name = "types.rdb";
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Name = "udkapi.rdb";
+InstallName = "types.rdb";
+Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
 End
 
 File gid_Test_File_Bin_LOSmoketest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add test for missing module-ix.html

2013-04-24 Thread David Tardon (via Code Review) 
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3578

Approvals:
  LibreOffice gerrit bot: Verified
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdbe04028ad9648af011da51b562cc6aa5e4849b
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: LibreOffice gerrit bot 

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

  1   2   >