Re: Reformatting a text document via UNO

[Miklos Vajna]

Hi,

On Wed, Nov 27, 2013 at 06:32:03PM +0100, Pavel Laštovička 
pavel.lastovi...@blue-point.cz wrote:
 By formatting I meant the process of building a line from portions,
 where SwLinePortion::Format() is called for each portion. From my
 testing this happens when some line portion changes its content (for
 example typing 1 character) or a user selects print preview.
 
 It could be done by inserting some content into a line and then
 deleting it back but I hope there is a more elegant solution :-)

The supported use-case is that initial layout runs after all the compat
options are set, so no, you probably can't avoid hacks if you set compat
options after-the-fact.

Miklos


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

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

[Stephan Bergmann]

 sc/source/core/data/dpobject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22aed8e030b5803cbfe5ac964bc6d8cdabf50875
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 09:04:22 2013 +0100

Use OUString::startsWith

Change-Id: I703148113f4df43d17500478509a9e208bf6

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index e8b384c..43d97fc 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1797,7 +1797,7 @@ bool ScDPObject::ParseFilters(
 aRemaining = comphelper::string::stripStart(aRemaining, ' 
');
 
 // field name has to be followed by item name in brackets
-if (!aRemaining.isEmpty()  aRemaining[0] == '[')
+if (aRemaining.startsWith([))
 {
 bHasFieldName = true;
 // bUsed remains false - still need the item
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Steve Yin]

 extensions/source/ole/oleobjw.cxx |   73 ++
 1 file changed, 43 insertions(+), 30 deletions(-)

New commits:
commit b0fa50814d9f5b5900df7bd8c00b54d57a010a20
Author: Steve Yin stev...@apache.org
Date:   Mon Dec 9 06:15:26 2013 +

Bug 123816 - Cannot send email with attachment via VBA code taking Notes as 
mail application

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index b4688c0..578c308 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2333,56 +2333,69 @@ void IUnknownWrapper_Impl::getPropDesc(const OUString  
sFuncName, FUNCDESC ** p
//else no entry for sFuncName, pFuncDesc will not be filled in
 }
 
-VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
+VARTYPE lcl_getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD 
nHrefType )
 {
 VARTYPE _type( VT_NULL );
-
-if (desc-vt == VT_PTR)
-{
-_type = getElementTypeDesc(desc-lptdesc);
-_type |= VT_BYREF;
-}
-else if (desc-vt == VT_SAFEARRAY)
+if ( pTypeInfo )
 {
-_type = getElementTypeDesc(desc-lptdesc);
-_type |= VT_ARRAY;
-}
-else if (desc-vt == VT_USERDEFINED)
-{
-ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
-CComPtrITypeInfo  spRefInfo;
-thisInfo-GetRefTypeInfo(desc-hreftype,  spRefInfo.p);
-if (spRefInfo)
+CComPtrITypeInfo spRefInfo;
+pTypeInfo-GetRefTypeInfo( nHrefType, spRefInfo.p );
+if ( spRefInfo )
 {
-TypeAttr  attr(spRefInfo);
-spRefInfo-GetTypeAttr(  attr);
-if (attr-typekind == TKIND_ENUM)
+TypeAttr attr( spRefInfo );
+spRefInfo-GetTypeAttr( attr );
+if ( attr-typekind == TKIND_ENUM )
 {
-//We use the type of the first enum value.
-if (attr-cVars == 0)
+// We use the type of the first enum value.
+if ( attr-cVars == 0 )
 {
-throw BridgeRuntimeError(OUSTR([automation bridge] Could 
-not obtain type description));
+throw BridgeRuntimeError(OUSTR([automation bridge] Could 
not obtain type description));
 }
-VarDesc var(spRefInfo);
-spRefInfo-GetVarDesc(0,  var);
+VarDesc var( spRefInfo );
+spRefInfo-GetVarDesc( 0, var );
 _type = var-lpvarValue-vt;
 }
-else if (attr-typekind == TKIND_INTERFACE)
+else if ( attr-typekind == TKIND_INTERFACE )
 {
 _type = VT_UNKNOWN;
 }
-else if (attr-typekind == TKIND_DISPATCH)
+else if ( attr-typekind == TKIND_DISPATCH )
 {
 _type = VT_DISPATCH;
 }
+else if ( attr-typekind == TKIND_ALIAS )
+{
+// TKIND_ALIAS is a type that is an alias for another type. So 
get that alias type.
+_type = lcl_getUserDefinedElementType( pTypeInfo, 
attr-tdescAlias.hreftype );
+}
 else
 {
-throw BridgeRuntimeError(OUSTR([automation bridge] 
-Unhandled user defined type.));
+throw BridgeRuntimeError( OUSTR([automation bridge] Unhandled 
user defined type.) );
 }
 }
 }
+return _type;
+}
+
+VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
+{
+VARTYPE _type( VT_NULL );
+
+if (desc-vt == VT_PTR)
+{
+_type = getElementTypeDesc(desc-lptdesc);
+_type |= VT_BYREF;
+}
+else if (desc-vt == VT_SAFEARRAY)
+{
+_type = getElementTypeDesc(desc-lptdesc);
+_type |= VT_ARRAY;
+}
+else if (desc-vt == VT_USERDEFINED)
+{
+ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
+_type = lcl_getUserDefinedElementType( thisInfo, desc-hreftype );
+}
 else
 {
 _type = desc-vt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 filter/source/xmlfilterdetect/filterdetect.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74ca95edd1bd3c00cf314690fe22171ec93d6885
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 10:12:49 2013 +0200

WaE: C4310: cast truncates constant value

Change-Id: I187382713aa85fa43e674f96e0a8cfb1f7ac0d03

diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx 
b/filter/source/xmlfilterdetect/filterdetect.cxx
index 27f173a..0b36b3d 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -79,10 +79,10 @@ bool isXMLStream(const OString aHeaderStrm)
 size_t i = 0;
 
 // Skip UTF-8 BOM
-const char sBOM[] = {(char)0xEF, (char)0xBB, (char)0xBF};
+const unsigned char sBOM[] = {0xEF, 0xBB, 0xBF};
 for (i = 0; i  n; ++i, ++p)
 {
-if (i  3  *p == sBOM[i])
+if (i  3  (unsigned char)(*p) == sBOM[i])
 continue;
 else if (i == 3 || i == 0)
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Videotutorial for extensions creation

[Miklos Vajna]

Hi,

On Sat, Dec 07, 2013 at 10:20:17AM +0100, - jvilche...@gmail.com wrote:
 I have seen you are an extensions developer.

Where did you see that?

 I would like to ask
 you, if you would like to create a simple videotutorial showing how
 to create an extension for LibreOffice?
 Something simple, like a dialog box with the Hello World?
 I need to start creating extensions, but I see a bunch of
 documentation and really I don't know how to start step by step.
 A simple tutorial, I think would help a lot to the community.

I don't plan to create video tutorials, but here are links to good
documentation on this topic:

- extension development in general
  https://wiki.documentfoundation.org/Development/Extension_Development
- python example
  
http://extensions.libreoffice.org/extension-center/libreoffice-does-print-on-tuesdays
- java howto
  https://wiki.openoffice.org/wiki/JavaEclipseTuto

Miklos


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

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - chart2/source

[Markus Mohrhard]

 chart2/source/view/inc/DummyXShape.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb8706084e0061ab42f039db11ff0574b4338b39
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Dec 9 09:20:44 2013 +0100

still editing the wrong copy of the file

Change-Id: I34933f312700f7ce6fca6f2e5f6c2bd3d118898e

diff --git a/chart2/source/view/inc/DummyXShape.hxx 
b/chart2/source/view/inc/DummyXShape.hxx
index b41f925..e68c5b8 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -401,7 +401,7 @@ private:
 class DummyChart : public DummyXShapes
 {
 public:
-DummyChart(com::sun::star::uno::Reference 
com::sun::star::drawing::XDrawPage  xDrawPage);
+DummyChart(com::sun::star::uno::Reference com::sun::star::drawing::XShape 
 xDrawPage);
 ~DummyChart();
 virtual DummyChart* getRootShape();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 sc/source/ui/dialogs/searchresults.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b51c840735029e8c61af4035f8db1d41ee8650ce
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Sat Dec 7 17:55:52 2013 +0100

SearchResults dialog: Use also AlignToCursor when setting cursor.

Change-Id: I4c802b5164bc0f0dc11da80c2225f9fc274e227c
(cherry picked from commit d45bc3429c859392aa9fd7932908e50b0716a39c)

diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index f5cc439..3b27a2a 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -69,6 +69,7 @@ IMPL_LINK_NOARG( SearchResults, ListSelectHdl )
 ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
 pScViewShell-SetTabNo(aAddress.Tab());
 pScViewShell-SetCursor(aAddress.Col(), aAddress.Row());
+pScViewShell-AlignToCursor(aAddress.Col(), aAddress.Row(), 
SC_FOLLOW_JUMP);
 return 0;
 }
 
commit 1a8afa24ffc1ba1e606617f263e1f8833ad4d0a9
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 9 08:52:59 2013 +0100

fdo#72413: Fix O(n^2) in inserting SearchResults' items.

Thanks to moggi, who pointed to this, should be documented somewhere.

Change-Id: I96ba2cca930e4b784a825987ea19e4fc9aacb6d6
(cherry picked from commit dc22a2aa1b2858394ad70806f34d1327936af7a0)

diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index fa89eb7..f5cc439 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -41,6 +41,7 @@ SearchResults::~SearchResults()
 void SearchResults::Show(const ScRangeList rMatchedRanges)
 {
 mpList-Clear();
+mpList-SetUpdateMode(false);
 for (size_t i = 0, n = rMatchedRanges.size(); i  n; ++i)
 {
 ScCellIterator aIter(mpDoc, *rMatchedRanges[i]);
@@ -53,6 +54,7 @@ void SearchResults::Show(const ScRangeList rMatchedRanges)
 mpList-InsertEntry(sAddress.replace('.', '\t') + \t + 
mpDoc-GetString(aAddress));
 }
 }
+mpList-SetUpdateMode(true);
 ModelessDialog::Show();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/abi10201.rtf|3 +++
 sw/qa/extras/rtfexport/rtfexport.cxx|5 +
 sw/source/filter/ww8/rtfattributeoutput.cxx |9 ++---
 sw/source/filter/ww8/rtfexport.hxx  |4 
 4 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit bc78c61bd29b1eac4ef70bfbcc67b4b49e16ccdd
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 09:40:46 2013 +0100

RTF export: unused forward declaration

Change-Id: Ida8e4d9e9b6ea7e1009b8cf617363d31e895a5a2

diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index 886322f..20b4c01 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -33,10 +33,6 @@ class SwTxtNode;
 class SwGrfNode;
 class SwOLENode;
 
-namespace com { namespace sun { namespace star {
-namespace frame { class XModel; }
-} } }
-
 /// The class that does all the actual RTF export-related work.
 class RtfExport : public MSWordExportBase
 {
commit 1cc1a893763c948f20463b808ea5eabe10eb7fd5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 09:40:14 2013 +0100

abi#10201 RTF export: fix crash when handling table::BorderLineStyle::NONE

Change-Id: I811820c0d550ce24ad2180a8917ef0087968c30b

diff --git a/sw/qa/extras/rtfexport/data/abi10201.rtf 
b/sw/qa/extras/rtfexport/data/abi10201.rtf
new file mode 100644
index 000..08cbe0c
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/abi10201.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+{\*\do\dobxpage\dobypara\dodhgt8192\dptxbx\dptxbxmar0\dpx2914\dpy5119\dpxsize6474\dpysize221\dplinehollow0}
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index b6084cb..f04e315 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -579,6 +579,11 @@ DECLARE_RTFEXPORT_TEST(testFdo66743, fdo66743.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xd8d8d8), getPropertysal_Int32(xCell, 
BackColor));
 }
 
+DECLARE_RTFEXPORT_TEST(testAbi10201, abi10201.rtf)
+{
+// crashtest
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index fd1eca3..d60d5c8 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3021,9 +3021,12 @@ void RtfAttributeOutput::FormatBox( const SvxBoxItem 
rBox )
 // We in fact need RGB to BGR, but the transformation is symmetric.
 m_aFlyProperties.push_back(std::make_pairOString, 
OString(lineColor, 
OString::number(msfilter::util::BGRToRGB(rColor.GetColor();
 
-double const 
fConverted(editeng::ConvertBorderWidthToWord(pTop-GetBorderLineStyle(), 
pTop-GetWidth()));
-sal_Int32 nWidth = sal_Int32(fConverted * 635); // Twips - EMUs
-m_aFlyProperties.push_back(std::make_pairOString, 
OString(lineWidth, OString::number(nWidth)));
+if (pTop-GetBorderLineStyle() != table::BorderLineStyle::NONE)
+{
+double const 
fConverted(editeng::ConvertBorderWidthToWord(pTop-GetBorderLineStyle(), 
pTop-GetWidth()));
+sal_Int32 nWidth = sal_Int32(fConverted * 635); // Twips - 
EMUs
+m_aFlyProperties.push_back(std::make_pairOString, 
OString(lineWidth, OString::number(nWidth)));
+}
 }
 
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 framework/source/services/substitutepathvars.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 56211a166ab25d80de84c2e22be15a9be051
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 09:38:35 2013 +0100

fdo#72394 Don't endlessly expand $(share_subdir_name) into itself

The introduction of $(share_subdir_name) expanding to share in
c6a73009747814513ab5a7277c211449c7378870 Use subfolder names from
config_folders.h shows that
SubstitutePathVariables::impl_reSubstituteVariables is fundamentally flawed 
in
that it allows reducing variable occurrences even in variable names, so 
that it
will expand an occurrence of share into an endless recursion of
$(share_subdir_name) - $($(share_subdir_name)_subdir_name) - ...

Adding $(share_subdir_name) to the list of variables that can only replace a
complete path segment (delimited by /), from which it had erroneously been
missing, fixes this problem for now.

But the code is still wrong in at least two respects:
* SubstitutePathVariables::impl_reSubstituteVariables arguably needs to be 
made
  more robust, to never reduce variable occurrences in variable names.
* The compile-time variable LIBO_SHARE_FOLDER should not end up as a runtime
  framework path variable, esp. since accidentally re-substituting it for
  share segments in unrelated URLs like file:///export/share/for-all 
does
  not make sense.  ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0 fdo#68552: 
Don't
  (attempt to) do run-time expansion of build-time parameters had already
  attempted a fix for that, but it had to be reverted again with
  791a8b96f754798192875da287c84f8cfa4e533e because it Unfortunately does 
not
  work if BUILDDIR is different from SRCDIR.

Change-Id: If214c179c0068fbaa475c1c9cac804d6a1dbb2dc

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index 41c0324..ec781f2 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -999,7 +999,8 @@ throw ( RuntimeException )
 bool bMatch = true;
 if ( pIterFixed-eVariable == PREDEFVAR_LANG ||
  pIterFixed-eVariable == PREDEFVAR_LANGID ||
- pIterFixed-eVariable == PREDEFVAR_VLANG )
+ pIterFixed-eVariable == PREDEFVAR_VLANG ||
+ pIterFixed-eVariable == PREDEFVAR_SHARE_SUBDIR_NAME )
 {
 // Special path variables as they can occur in the middle 
of a path. Only match if they
 // describe a whole directory and not only a substring of 
a directory!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Easy export filter testing

[Miklos Vajna]

Hi,

On Thu, Dec 05, 2013 at 05:23:21PM +, Michael Meeks 
michael.me...@collabora.com wrote:
 + export crashers - pretty bad - help appreciated.
 + much slower: 2 days for 4k documents of CPU time 8x wide so far.
+ export each document into 3x formats.
 + only running ODS, etc. run out space / memory / core-dumps etc.
 + 800 rtf docs - 41 export crashers for rtf/docx/odt
 http://dev-builds.libreoffice.org/crashtest/test/rtf/

I started to fix these; I guess it would help a lot if
test::FiltersTest could do export testing as well, like: I put a bunch
of documents in a directory, specify what export filter to use, and it
would fail if some of them fail. (Probably the pass/fail separation is
not that meaningful for export, as AFAIK export always succeeds.)

Caolán, do I remember correctly that FiltersTest is your baby? Any
objections?

Thanks,

Miklos


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

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

[Khaled Hosny]

 sw/source/core/txtnode/fntcache.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 02ce734450559c9353ca7f42b2519239220dd265
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Dec 8 22:30:28 2013 +0200

fdo#72488: Broken text when showing visible space

Turning on showing nonprinting characters replaces the space with bullet
character, but still draws the text with the original kern array, this
works fine until there are ligatures involving the space character as
the number of glyphs after replacing the space with the bullet will be
different and the kern array will be completely off.

This is a hack that gives up on replacing the space with a bullet when
its width is zero, not sure if it would interfere with other legitimate
uses.

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

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 3ea5be7..a1b0eeb 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1569,7 +1569,13 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 
 for( sal_Int32 i = 0; i  aStr.getLength(); ++i )
 if( CH_BLANK == aStr[ i ] )
-aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+{
+/* fdo#72488 Hack: try to see if the space is zero width
+ * and don't bother with inserting a bullet in this case.
+ */
+if (pKernArray[i + nCopyStart] != pKernArray[ i + 
nCopyStart + 1])
+aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+}
 }
 
 sal_Int32 nCnt = rInf.GetText().getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[no subject]

[Amul Mehta]

Hello all ,
I am a 2nd year Computer Science undergraduate student. The work you people
do sounds extremely fascinating and interesting !! .
I am very much interested in contributing code to the Libre Office project.
Can someone just give me a brief overview of how to proceed ?.
I have a basic coding knowledge of C and C++ .
However , I am new to working on  an real world application like Libre
Office and the open source world  and would really appreciate if someone
could give me some help on how to start with  IRC .

 Thanks .

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

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - glm/UnpackedTarball_glm.mk glm/Wshadow.patch glm/Wshadow-unix.patch glm/Wshadow-windows.patch

[Markus Mohrhard]

 glm/UnpackedTarball_glm.mk |8 
 glm/Wshadow-unix.patch | 2659 +
 glm/Wshadow-windows.patch  | 2659 +
 glm/Wshadow.patch  | 2659 -
 4 files changed, 5325 insertions(+), 2660 deletions(-)

New commits:
commit 8e8ac95f667b5a9f4f3481edc9ffa6c39c837b9f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Dec 9 10:15:45 2013 +0100

next try to get glm patched on windows and linux

Change-Id: Ia17217db6cbf5110926302611a4b37faeacc9bfd

diff --git a/glm/UnpackedTarball_glm.mk b/glm/UnpackedTarball_glm.mk
index 79d93af..99c5776 100644
--- a/glm/UnpackedTarball_glm.mk
+++ b/glm/UnpackedTarball_glm.mk
@@ -13,8 +13,14 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 
+ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,glm,\
-   glm/Wshadow.patch \
+   glm/Wshadow-windows.patch \
 ))
+else
+$(eval $(call gb_UnpackedTarball_add_patches,glm,\
+   glm/Wshadow-unix.patch \
+))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/glm/Wshadow-unix.patch b/glm/Wshadow-unix.patch
new file mode 100644
index 000..8607753
--- /dev/null
+++ b/glm/Wshadow-unix.patch
@@ -0,0 +1,2659 @@
+diff -ur glm.org/glm/core/_detail.hpp glm/glm/core/_detail.hpp
+--- glm.org/glm/core/_detail.hpp   2013-12-09 02:05:30.115442079 +0100
 glm/glm/core/_detail.hpp   2013-12-09 02:06:33.749941584 +0100
+@@ -136,12 +136,12 @@
+   i(0)
+   {}
+ 
+-  GLM_FUNC_QUALIFIER uif32(float f) :
+-  f(f)
++  GLM_FUNC_QUALIFIER uif32(float f_) :
++  f(f_)
+   {}
+ 
+-  GLM_FUNC_QUALIFIER uif32(unsigned int i) :
+-  i(i)
++  GLM_FUNC_QUALIFIER uif32(unsigned int i_) :
++  i(i_)
+   {}
+ 
+   float f;
+@@ -154,12 +154,12 @@
+   i(0)
+   {}
+ 
+-  GLM_FUNC_QUALIFIER uif64(double f) :
+-  f(f)
++  GLM_FUNC_QUALIFIER uif64(double f_) :
++  f(f_)
+   {}
+ 
+-  GLM_FUNC_QUALIFIER uif64(uint64 i) :
+-  i(i)
++  GLM_FUNC_QUALIFIER uif64(uint64 i_) :
++  i(i_)
+   {}
+ 
+   double f;
+diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp
+--- glm.org/glm/core/type_vec1.hpp 2013-12-08 17:04:59.706365245 +0100
 glm/glm/core/type_vec1.hpp 2013-12-08 17:07:20.079840510 +0100
+@@ -86,19 +86,19 @@
+   GLM_FUNC_DECL explicit tvec1(
+   ctor);
+   GLM_FUNC_DECL explicit tvec1(
+-  value_type const  s);
++  value_type const  s_);
+ 
+   //
+   // Swizzle constructors
+ 
+-  GLM_FUNC_DECL tvec1(tref1T const  r);
++  GLM_FUNC_DECL tvec1(tref1T const  r_);
+ 
+   //
+   // Convertion scalar constructors
+ 
+   //! Explicit converions (From section 5.4.1 Conversion and 
scalar constructors of GLSL 1.30.08 specification)
+   template typename U 
+-  GLM_FUNC_DECL explicit tvec1(U const  s);
++  GLM_FUNC_DECL explicit tvec1(U const  s_);
+ 
+   //
+   // Convertion vector constructors
+@@ -121,19 +121,19 @@
+   GLM_FUNC_DECL tvec1T  operator= (tvec1U const  v);
+ 
+   template typename U 
+-  GLM_FUNC_DECL tvec1T  operator+=(U const  s);
++  GLM_FUNC_DECL tvec1T  operator+=(U const  s_);
+   template typename U 
+   GLM_FUNC_DECL tvec1T  operator+=(tvec1U const  v);
+   template typename U 
+-  GLM_FUNC_DECL tvec1T  operator-=(U const  s);
++  GLM_FUNC_DECL tvec1T  operator-=(U const  s_);
+   template typename U 
+   GLM_FUNC_DECL tvec1T  operator-=(tvec1U const  v);
+   template typename U 
+-  GLM_FUNC_DECL tvec1T  operator*=(U const  s);
++  GLM_FUNC_DECL tvec1T  operator*=(U const  s_);
+   template typename U 
+   GLM_FUNC_DECL tvec1T  operator*=(tvec1U const  v);
+   template typename U 
+-  GLM_FUNC_DECL tvec1T  operator/=(U const  s);
++  GLM_FUNC_DECL tvec1T  operator/=(U const  s_);
+   template typename U 
+   GLM_FUNC_DECL tvec1T  operator/=(tvec1U const  v);
+   GLM_FUNC_DECL tvec1T  operator++();
+@@ -143,27 +143,27 @@
+   // Unary bit operators
+ 
+   template typename U 
+-  

Re:

[Sharuzzaman Ahmat Raslan]

Hi Amul,

You can start with the Easy Hacks.
https://wiki.documentfoundation.org/Easy_Hacks

Thanks.



On Mon, Dec 9, 2013 at 5:11 PM, Amul Mehta mht.a...@gmail.com wrote:

 Hello all ,
 I am a 2nd year Computer Science undergraduate student. The work you
 people do sounds extremely fascinating and interesting !! .
 I am very much interested in contributing code to the Libre Office
 project.
 Can someone just give me a brief overview of how to proceed ?.
 I have a basic coding knowledge of C and C++ .
 However , I am new to working on  an real world application like Libre
 Office and the open source world  and would really appreciate if someone
 could give me some help on how to start with  IRC .

  Thanks .

  Amul . Mehta

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




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

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

[Tor Lillqvist]

 framework/inc/services/substitutepathvars.hxx|2 --
 framework/source/services/substitutepathvars.cxx |   17 +
 2 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit b596c6d74d4808f4793df51c81a93b12011314c7
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 11:26:37 2013 +0200

Bin pointless micro-optimisation

Change-Id: I87285411001a1535dae5dd921f5cceb1570d5f95

diff --git a/framework/inc/services/substitutepathvars.hxx 
b/framework/inc/services/substitutepathvars.hxx
index f7a8fe3..ba0e34b 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -146,8 +146,6 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
 OUString   m_aNTDomain;
 boolm_bHostRetrieved;
 OUString   m_aHost;
-boolm_bOSRetrieved;
-OperatingSystem m_eOSType;
 
 Linkm_aListenerNotify;
 const OUString m_aSharePointsNodeName;
diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index ec781f2..ac2dc08 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -230,7 +230,6 @@ SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( 
const Link aNotifyL
 m_bDNSDomainRetrieved( false ),
 m_bNTDomainRetrieved( false ),
 m_bHostRetrieved( false ),
-m_bOSRetrieved( false ),
 m_aListenerNotify( aNotifyLink ),
 m_aSharePointsNodeName( OUString( SharePoints )),
 m_aDirPropertyName( OUString( /Directory )),
@@ -300,23 +299,17 @@ void SubstitutePathVariables_Impl::Commit()
 
 OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
 {
-if ( !m_bOSRetrieved )
-{
 #ifdef SOLARIS
-m_eOSType = OS_SOLARIS;
+return OS_SOLARIS;
 #elif defined LINUX
-m_eOSType = OS_LINUX;
+return OS_LINUX;
 #elif defined WIN32
-m_eOSType = OS_WINDOWS;
+return OS_WINDOWS;
 #elif defined UNIX
-m_eOSType = OS_UNIX;
+return OS_UNIX;
 #else
-m_eOSType = OS_UNKNOWN;
+return OS_UNKNOWN;
 #endif
-m_bOSRetrieved = sal_True;
-}
-
-return m_eOSType;
 }
 
 const OUString SubstitutePathVariables_Impl::GetYPDomainName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Example in Java

[Fernand Vanrie]

Adriam, Miklos

indeed insertstring do not works when inserting text in a tablecell
we need to use setstring instead

code below shows how we need to now if we insert in a cell or in a textFrame

 if not isEmpty(oVC.Cell)  then
   oVC.cell.setstring(BMname) ' insertstring do not works here
 endif
if isEmpty(oVC.TextFrame) and isEmpty(oVC.Cell) then
oVc.gotostart(true)'alle tekst geselecteerd
oVc.text.InsertString(oVC,BMname,True)
endif

hope it helps

Fernand

On Fri, Dec 06, 2013 at 04:21:16PM -0500, Adriam Delgado Rivero 
adriv...@uci.cu wrote:

I'm watching the example 
http://api.libreoffice.org/examples/java/Text/SWriter.java , and insertString 
method does not work. This happens only with libreoffice 4. Works on 
libreoffice 3.6, anyone knows passes, took almost a month with this.

Hi,

What do you mean by does not work exactly? What is the error message
you get?

Miklos


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


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

Willing to contribute with LibreOffice Basic Tutorial.

[Shraddha Gujarathi]

Hello,

The work you people have started is very interesting. I am Python developer
and used to with Java and C++ development and working on opensource
applications. I would like to participate in this work.
Till now I have gone through some modules in source code (ex: embeddedobj,
embedserv, icon-themes). I have Build LibreOffice source code in my
environment.
Also I am working on bug attaching OLE object in LibreOffice. Kindly refer
below link:

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


Could you provide overview for what favour you want from me.



Thanks and regards
-- 

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

[Bug 32419] When inserted on Writer, get Base size for formulas from underlining paragraph

[bugzilla-daemon]

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

--- Comment #7 from Yury yury.tarasiev...@gmail.com ---
Would the hacky scripts changing settings formula objects still work in
libreoffice 4.1 and libreofficedev 4.2 ? I've been happily using python
variation of somebody's code I've seen on forumas or something, going like: 

import uno

def SameFontSettingsForAll( ):
  oDoc = XSCRIPTCONTEXT.getDocument()
  all_embeds = oDoc.getEmbeddedObjects()
  all_embeds_cnt = all_embeds.getCount()
  for i in xrange(0,all_embeds_cnt) :
embedded = all_embeds.getByIndex(i);
if embedded.Model.supportsService(com.sun.star.formula.FormulaProperties)
:
...

But in libreoffice 4.1 and libreofficedev 4.2 this fails with explanation:

global name 'xrange' is not defined

What should I change?

-- 
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 'aoo/trunk' - 3 commits - solenv/bin

[Andre Fischer]

 solenv/bin/modules/installer/download.pm  |   32 ++
 solenv/bin/modules/installer/languages.pm |   25 ++
 solenv/bin/modules/installer/patch/InstallationSet.pm |2 -
 solenv/bin/modules/installer/patch/Msi.pm |   11 +-
 solenv/bin/modules/installer/simplepackage.pm |2 -
 solenv/bin/modules/installer/worker.pm|6 ++-
 solenv/bin/srcrelease.xml |2 -
 solenv/bin/update_module_ignore_lists.pl  |4 +-
 8 files changed, 57 insertions(+), 27 deletions(-)

New commits:
commit 0bcdf29f92417baed014fca55932727f31260174
Author: Andre Fischer a...@apache.org
Date:   Mon Dec 9 08:43:20 2013 +

123531: Handle languages that are internally prefixed with 'en-US_'

diff --git a/solenv/bin/modules/installer/languages.pm 
b/solenv/bin/modules/installer/languages.pm
index 0b19c1f..260e96c 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -462,4 +462,29 @@ sub get_key_language ($)
 }
 }
 
+
+
+
+=head2 get_normalized_language ($language)
+
+Transform ..._language into language.
+The ... part, if it exists, is typically en-US.
+
+If $language does not contain a '_' then $language is returned unmodified.
+
+=cut
+sub get_normalized_language ($)
+{
+my ($language) = @_;
+
+if ($language =~ /^.*?_(.*)$/)
+{
+return $1;
+}
+else
+{
+return $language;
+}
+}
+
 1;
diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm 
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index e30adc4..876bfb8 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -253,7 +253,7 @@ sub GetUnpackedPath ($)
 $package_format,
 installer::patch::Version::ArrayToDirectoryName(
 installer::patch::Version::StringToNumberArray($version)),
-$language);
+installer::languages::get_normalized_language($language));
 }
 
 
diff --git a/solenv/bin/modules/installer/patch/Msi.pm 
b/solenv/bin/modules/installer/patch/Msi.pm
index 5cefda8..e5b47f6 100644
--- a/solenv/bin/modules/installer/patch/Msi.pm
+++ b/solenv/bin/modules/installer/patch/Msi.pm
@@ -51,7 +51,7 @@ sub FindAndCreate($)
 $path = installer::patch::InstallationSet::GetUnpackedExePath(
 $version,
 $is_current_version,
-$language,
+installer::languages::get_normalized_language($language),
 msi,
 $product_name);
 
@@ -75,6 +75,7 @@ sub FindAndCreate($)
 If construction fails then IsValid() will return false.
 
 =cut
+
 sub new ($$)
 {
 my ($class, $filename, $version, $is_current_version, $language, 
$product_name) = @_;
@@ -122,6 +123,7 @@ sub IsValid ($)
 Write all modified tables back into the databse.
 
 =cut
+
 sub Commit ($)
 {
 my $self = shift;
@@ -159,6 +161,7 @@ sub Commit ($)
 call for the same table is very cheap.
 
 =cut
+
 sub GetTable ($$)
 {
 my ($self, $table_name) = @_;
@@ -197,6 +200,7 @@ sub GetTable ($$)
 Write the given table back to the databse.
 
 =cut
+
 sub PutTable ($$)
 {
 my ($self, $table) = @_;
@@ -243,6 +247,7 @@ sub PutTable ($$)
 to their last modification times (mtime).
 
 =cut
+
 sub EnsureAYoungerThanB ($$)
 {
 my ($filename_a, $filename_b) = @_;
@@ -276,6 +281,7 @@ sub EnsureAYoungerThanB ($$)
 Returns long and short name (in this order) as array.
 
 =cut
+
 sub SplitLongShortName ($)
 {
 my ($name) = @_;
@@ -300,6 +306,7 @@ sub SplitLongShortName ($)
 table.
 
 =cut
+
 sub SplitTargetSourceLongShortName ($)
 {
 my ($name) = @_;
@@ -322,6 +329,7 @@ sub SplitTargetSourceLongShortName ($)
 to hashes that contains short and long source and target names.
 
 =cut
+
 sub GetDirectoryMap ($)
 {
 my ($self) = @_;
@@ -423,6 +431,7 @@ sub GetDirectoryMap ($)
 calls but the first are cheap.
 
 =cut
+
 sub GetFileMap ($)
 {
 my ($self) = @_;
commit f63ec98285ba6fbe47927967798a109e62be94c9
Author: Andre Fischer a...@apache.org
Date:   Mon Dec 9 08:37:41 2013 +

123729: Reapply changes that where accidentally merged out.

diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index c7058f4..b7db099 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -733,8 +733,10 @@ sub remove_all_items_with_special_flag
 if ( $oneitem-{'Styles'} ) { $styles = $oneitem-{'Styles'} };
 if ( $styles =~ /\b$flag\b/ )
 {
-my $infoline = Attention: Removing from collector: 
$oneitem-{'Name'} !\n;
-$installer::logger::Lang-print($infoline);
+$installer::logger::Lang-printf(
+Attention: Removing from collector '%s' because it has flag 
%s\n,
+$oneitem-{'Name'},
+$flag);
 

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

[Jan Holesovsky]

 solenv/gbuild/platform/com_MSC_class.mk |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 830b42cba24db82105fc129bcf73f9d3920ff8d0
Author: Jan Holesovsky ke...@collabora.com
Date:   Sun Dec 8 14:12:30 2013 +0100

Name the .pdb files so that WinDbg can consume them.

Change-Id: I62cecfb36dd912a1a736d063761faa445a29f3a7

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 790ba16..4c5454c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -133,12 +133,21 @@ gb_LinkTarget_INCLUDE :=\
$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-I$(BUILDDIR)/config_$(gb_Side) \
 
+# We must name the .pdb like libname.pdb, not libname.\(dll\|exe\|pyd\).pdb,
+# otherwise WinDbg does not find it.
+define gb_LinkTarget__get_pdb_filename
+$(patsubst %.dll,%.pdb,$(patsubst %.exe,%.pdb,$(patsubst %.pyd,%.pdb,$(1
+endef
+
 gb_LinkTarget_get_pdbfile_in = \
  $(WORKDIR)/LinkTarget/$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)).objects.pdb
+
 gb_LinkTarget_get_pdbfile_out = \
- $(WORKDIR)/LinkTarget/$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)).pdb
+ $(call gb_LinkTarget__get_pdb_filename,$(WORKDIR)/LinkTarget/$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)))
+
 gb_LinkTarget_get_ilkfile = \
  $(WORKDIR)/LinkTarget/$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)).ilk
+
 gb_LinkTarget_get_manifestfile = \
  $(WORKDIR)/LinkTarget/$(call 
gb_LinkTarget__get_workdir_linktargetname,$(1)).manifest
 
@@ -193,7 +202,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),\
$(T_LIBS) user32.lib \
-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \
-   -pdb:$(WORKDIR)/LinkTarget/$(2).pdb) \
+   -pdb:$(call 
gb_LinkTarget__get_pdb_filename,$(WORKDIR)/LinkTarget/$(2))) \
$(if $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1)); 
RC=$$?; rm $${RESPONSEFILE} \
$(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then 
rm -f $(1); exit 42; fi) \
$(if $(filter Library,$(TARGETTYPE)), if [ -f 
$(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest 
$(WORKDIR)/LinkTarget/$(2).manifest -outputresource:$(1)\;2  touch -r $(1) 
$(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vinaya Mandke]

 writerfilter/source/dmapper/DomainMapper.cxx  |4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit aefd8ff742f8952327f1bddc37e62317d69ffb7d
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date:   Mon Dec 9 15:13:20 2013 +0530

Follow-up Patch

Changed variable names to Hungarian Notation

Change-Id: I00f2a91f9faa4fd779851be7b48449a7be203e49
Reviewed-on: https://gerrit.libreoffice.org/7007
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8502466..190e4b0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3693,7 +3693,7 @@ void DomainMapper::lcl_startParagraphGroup()
 else if (m_pImpl-isBreakDeferred(COLUMN_BREAK))
 m_pImpl-GetTopContext()-Insert( PROP_BREAK_TYPE, uno::makeAny( 
com::sun::star::style::BreakType_COLUMN_BEFORE) );
 }
-m_pImpl-SetIsFirstRun();
+m_pImpl-SetIsFirstRun(true);
 m_pImpl-clearDeferredBreaks();
 }
 
@@ -3977,7 +3977,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 }
 
 }
-m_pImpl-UpdateIsFirstRun();
+m_pImpl-SetIsFirstRun(false);
 }
 catch( const uno::RuntimeException )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7b60f09..1e4bdf4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -170,7 +170,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bParaSectpr( false ),
 m_bUsingEnhancedFields( false ),
 m_bSdt(false),
-m_isFirstRun(false),
+m_bIsFirstRun(false),
 m_xInsertTextRange(xInsertTextRange),
 m_bIsNewDoc(bIsNewDoc),
 m_bInTableStyleRunProps(false),
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 34b87a2..b13924b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -387,7 +387,7 @@ private:
 boolm_bUsingEnhancedFields;
 /// If the current paragraph is inside a structured document element.
 boolm_bSdt;
-boolm_isFirstRun;
+boolm_bIsFirstRun;
 
 //annotation import
 uno::Reference beans::XPropertySet   
m_xAnnotationField;
@@ -678,9 +678,8 @@ public:
 void RemoveCurrentRedline( );
 void ResetParaRedline( );
 void SetCurrentRedlineInitials( OUString sInitials );
-bool IsFirstRun() { return m_isFirstRun;}
-void SetIsFirstRun() { m_isFirstRun = true;}
-void UpdateIsFirstRun() { m_isFirstRun = false;}
+bool IsFirstRun() { return m_bIsFirstRun;}
+void SetIsFirstRun(bool bval) { m_bIsFirstRun = bval;}
 
 void ApplySettingsTable();
 SectionPropertyMap * GetSectionContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppunitTest_sc_opencl_test clBuildProgram CL_BUILD_PROGRAM_FAILURE

[Stephan Bergmann]

I was trying to find out why on my MacBook recent master make check 
reproducibly fails CppunitTest_sc_opencl with



warn:sc.opencl:13647:1:sc/source/core/opencl/formulagroupcl.cxx:2737: 
CL_BUILD_PROGRAM_FAILURE, status -2, log Error getting function data from 
server

[...]

warn:sc.opencl:13647:1:sc/source/core/opencl/formulagroupcl.cxx:2737: 
CL_BUILD_PROGRAM_FAILURE, status -2, log Error getting function data from 
server

[...]

warn:sc.opencl:13647:1:sc/source/core/opencl/formulagroupcl.cxx:2737: 
CL_BUILD_PROGRAM_FAILURE, status -2, log Error getting function data from 
server

[...]

warn:sc.opencl:13647:1:sc/source/core/opencl/formulagroupcl.cxx:2737: 
CL_BUILD_PROGRAM_FAILURE, status -2, log Error getting function data from 
server

[...]

##Failure Location unknown## : Error
Test name: ScOpenclTest::testFinacialFormula
uncaught exception of unknown type

##Failure Location unknown## : Error
Test name: ScOpenclTest::testFinancialCoupdaysncFormula
uncaught exception of unknown type

##Failure Location unknown## : Error
Test name: ScOpenclTest::testFinacialYIELDFormula
uncaught exception of unknown type

##Failure Location unknown## : Error
Test name: ScOpenclTest::testFinacialPriceFormula
uncaught exception of unknown type

Failures !!!
Run: 174   Failure total: 4   Failures: 0   Errors: 4


while just make CppunitTest_sc_opencl succeeds.  Turns out the machine 
has two GPUs, a built-in Intel HD Graphics 4000 and an additional NVIDIA 
GeForce GT 650M, and that it apparently executes the OpenCL code on the 
latter (where it fails) only if there's enough graphics power demand, 
like in the case of a full (non-headless on Mac) make check.  (Though 
it looks like it doesn't suffice to disable System Preferences... - 
Energy Saver - Automatic graphics switching to make it use the NVIDIA 
GPU for the OpenCL code even in the make CppunitTest_sc_opencl scenario.)


And using the NVIDIA GPU to compile some of the OpenCL programs 
apparently causes a CL_BUILD_PROGRAM_FAILURE from clBuildProgram. 
However, the Error getting function data from server program build log 
does not give much of a clue what's going wrong.  (And inducing 
something like a syntax error into the OpenCL program code would result 
in a much more verbose log pointing out the compilation error, so it 
can't be something trivial like that.)


The OpenCL program code in the first of the four failing cases is


#pragma OPENCL EXTENSION cl_khr_fp64: enable
int isNan(double a) { return isnan(a); }
double fsum_count(double a, double b, __private int *p) {
bool t = isNan(a);
(*p) += t?0:1;
return t?b:a+b;
}
double fsum(double a, double b) { return isNan(a)?b:a+b; }
double legalize(double a, double b) { return isNan(a)?b:a;}
double fsub(double a, double b) { return a-b; }
double fdiv(double a, double b) { return a/b; }
double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }
double mcw_fmin(double a, double b) { return fmin(a, b); }
double mcw_fmax(double a, double b) { return fmax(a, b); }
bool IsLeapYear( int n );
double coupdaybs( int nSettle,int nMat,int nFreq,int nBase);
double coupdays(int nSettle,int nMat,int nFreq,int nBase);
double coupdaysnc( int nSettle,int nMat,int nFreq,int nBase);
double coupnum( int nSettle,int nMat,int nFreq,int nBase);
double getPrice_(int nSettle, int nMat, double fRate, double fYield,
double fRedemp, int nFreq, int nBase );
double getYield_( int nNullDate, int nSettle, int nMat, double fCoup,double 
fPrice,double fRedemp, int nFreq, int nBase);
int  DateToDays( int nDay, int nMonth, int nYear );
int DaysInMonth( int nMonth, int nYear );
int GetDaysInYear( int nNullDate, int nDate, int nMode );
int GetDaysInYears( int nYear1, int nYear2 );
int GetNullDate(void);
int getDaysInMonthRange( int nFrom, int nTo,int b30Days,int year);
int getDaysInYearRange( int nFrom, int nTo,int b30Days );
int getDiff(int rFrom,int rTo,int fDay,int fMonth,int fYear,int 
fbLastDayMode,int fbLastDay,int fb30Days,int fbUSMode,int fnDay,int tDay,int 
tMonth,int tYear,int tbLastDayMode,int tbLastDay,int tb30Days,int tbUSMode,int 
tnDay);
int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase);
int lcl_Getcoupdays(int nNullDate,int nSettle, int nMat,int nFreq,int nBase);
int lcl_Getcoupnum(int nNullDate,int nSettle, int nMat,int nFreq);
void DaysToDate( int nDays, int *rDay, int* rMonth, int* rYear );
void ScaDate( int nNullDate, int nDate, int nBase,int *nOrigDay, int 
*nMonth,int *nYear,int *bLastDayMode,int *bLastDay,int *b30Days,int 
*bUSMode,int *nDay);
void addMonths(int b30Days,int bLastDay,int *nDay,int nOrigDay,int *nMonth,int 
nMonthCount,int *year);
bool IsLeapYear( int n )
{
return ( (( ( n % 4 ) == 0 )  ( ( n % 100 ) != 0)) || ( ( n % 400 ) == 0 
) );
}
double coupdaybs( int nSettle,int nMat,int nFreq,int nBase)
{
int nNullDate=GetNullDate();
return lcl_Getcoupdaybs(nNullDate, nSettle, nMat,nFreq, nBase);
}
double coupdays(int nSettle,int nMat,int nFreq,int nBase)
{

Windows symbols server

[Jan Holesovsky]

Hi,

Michael Meeks píše v Čt 05. 12. 2013 v 17:23 +:

 * Symbols for Windows releases (Markus)
[...]
 + Kendy's tinderbox is now providing the symbols (Kendy)
 + http://dev-builds.libreoffice.org/daily/master/Win-x86@39/symbols/
 + We need it for release builds (Markus)
 + only just enabled Lubos' script - don't know if it works (Kendy)
[...]
 AI:   + work out what QA wants for tinderboxen (Robinson)
[...]
 + can we produce release builds with this ? (Michael)
 AI: + up-load not that fast, need to look at the data set (Christian)
[...]
   
 http://cgit.freedesktop.org/libreoffice/contrib/buildbot/commit/?id=5084dda3bbd9861273029f2ab5d22434742d09ad

So - to sum the above up, the symbol server did not work as at it was
set up, but works now after the weekend ;-)  If you want to upload the
release builds symbols, the best would be move the code from the above
mentioned commit directly to bin/ in core (together with the

http://cgit.freedesktop.org/libreoffice/contrib/buildbot/commit/?id=0fc460e1772b3f150a49b0b732f505f572fba65b

fixup), and use it for the release builds as well as in the tinderbox,
so that we have one master version of the symbols uploading script.

Cloph - one catch about the symbols is that the URL where they are
located must be all lower case! ;-) - WinDbg lowercases whatever you
provide there.  But overall they are not _that_ huge, currently about
2.7G.

For the QA purposes, I slightly updated the

https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg

article, but I am afraid it is still less than ideal; but at least the
First Time Setup should be easier to follow now.  Any improvements in
the article much appreciated :-)

All the best,
Kendy

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

[Libreoffice-commits] core.git: connectivity/source dbaccess/source desktop/source extensions/source framework/source sc/source sfx2/source svx/source toolkit/source vcl/unx xmloff/source

[Noel Grandin]

 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx|4 
 dbaccess/source/core/api/FilteredContainer.cxx   |4 
 dbaccess/source/ui/dlg/tablespage.cxx|2 
 desktop/source/migration/migration.cxx   |2 
 extensions/source/update/feed/updatefeed.cxx |2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx |   38 +++---
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx  |   26 ++--
 framework/source/uielement/imagebuttontoolbarcontroller.cxx  |6 -
 framework/source/uielement/spinfieldtoolbarcontroller.cxx|   32 ++---
 framework/source/uielement/togglebuttontoolbarcontroller.cxx |   26 ++--
 framework/source/uielement/toolbarwrapper.cxx|2 
 framework/source/uifactory/addonstoolboxfactory.cxx  |6 -
 sc/source/core/tool/formulaopt.cxx   |4 
 sc/source/filter/xml/XMLTrackedChangesContext.cxx|2 
 sc/source/filter/xml/xmlcvali.cxx|4 
 sc/source/filter/xml/xmlexprt.cxx|2 
 sc/source/ui/app/inputhdl.cxx|   32 ++---
 sfx2/source/control/unoctitm.cxx |   10 -
 svx/source/xoutdev/xattr.cxx |4 
 toolkit/source/controls/dialogcontrol.cxx|2 
 toolkit/source/controls/unocontrol.cxx   |   14 +-
 vcl/unx/generic/dtrans/X11_selection.cxx |   10 -
 xmloff/source/draw/XMLImageMapExport.cxx |2 
 xmloff/source/script/XMLEventExport.cxx  |2 
 xmloff/source/text/txtflde.cxx   |   64 +--
 xmloff/source/text/txtparae.cxx  |3 
 26 files changed, 148 insertions(+), 157 deletions(-)

New commits:
commit c5b7a5fd191a8ec65a64980fe3197832dba1ffae
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 9 12:51:35 2013 +0200

fix equalsAscii conversion. Noticed in fdo#72391

In commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3
convert equalsAsciiL calls to startWith calls where possible
I incorrectly converted equalsAsciiL calls to startsWith calls.
This commit fixes those places to use the == OUString operator.

Change-Id: If76993baf73e3d8fb3bbcf6e8314e59fdc1207b6

diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 
b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index c257a39..f563c51 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -135,7 +135,7 @@ Reference XResultSet  SAL_CALL 
java_sql_DatabaseMetaData::getTables(
 bool bIncludeAllTypes = false;
 for ( sal_Int32 i=0; itypeFilterCount; ++i, ++typeFilter )
 {
-if ( typeFilter-startsWith( % ) )
+if ( *typeFilter == % )
 {
 bIncludeAllTypes = true;
 break;
@@ -163,7 +163,7 @@ Reference XResultSet  SAL_CALL 
java_sql_DatabaseMetaData::getTables(
 aCatalogFilter = m_pConnection-getCatalogRestriction();
 // similar for schema
 Any aSchemaFilter;
-if ( schemaPattern.startsWith( % ) )
+if ( schemaPattern == % )
 aSchemaFilter = m_pConnection-getSchemaRestriction();
 else
 aSchemaFilter = schemaPattern;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index dfa656c..7e5de81 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -168,7 +168,7 @@ sal_Int32 createWildCardVector(Sequence OUString  
_rTableFilter, ::std::vecto
 
 // first, filter for the table names
 sal_Int32 nTableFilterCount = _tableFilter.getLength();
-sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 )  
_tableFilter[0].startsWith( % ) );
+sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 )  
_tableFilter[0] == % );
 if( dontFilterTableNames )
 {
 aFilteredTables = _unfilteredTables;
@@ -198,7 +198,7 @@ sal_Int32 createWildCardVector(Sequence OUString  
_rTableFilter, ::std::vecto
 
 // second, filter for the table types
 sal_Int32 nTableTypeFilterCount = _tableTypeFilter.getLength();
-sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 )  
_tableTypeFilter[0].startsWith( % ) );
+sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 )  
_tableTypeFilter[0] == % );
 dontFilterTableTypes = dontFilterTableTypes || ( nTableTypeFilterCount 
== 0 );
 // (for TableTypeFilter, unlike TableFilter, empty means do not 
filter at all)
 if ( !dontFilterTableTypes )
diff --git 

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

[Miklos Vajna]

 oox/source/drawingml/textbodycontext.cxx|   12 +++
 oox/source/drawingml/textcharacterpropertiescontext.cxx |   25 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|7 
 3 files changed, 44 insertions(+)

New commits:
commit f7a8a5e48ae07551e0f513da57f95d81bdbab43a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 11:30:40 2013 +0100

drawingml import: read w:color

Change-Id: I6ae7ea8b58e262e5b6226f8f789e39ebcc6077ca

diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 405957c..12362b9 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -137,6 +137,10 @@ ContextHandlerRef 
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
 case OOX_TOKEN( doc, bCs ):
 break;
 case OOX_TOKEN( doc, color ):
+if (rAttribs.getInteger(OOX_TOKEN(doc, val)).has())
+{
+
mrTextCharacterProperties.maCharColor.setSrgbClr(rAttribs.getIntegerHex(OOX_TOKEN(doc,
 val)).get());
+}
 break;
 case OOX_TOKEN( doc, sz ):
 if (rAttribs.getInteger(OOX_TOKEN(doc, val)).has())
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9c6510d..7223179 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1607,6 +1607,13 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, 
mce-nested.docx)
 uno::Referencedrawing::XShapeDescriptor xShapeDescriptor(getShape(2), 
uno::UNO_QUERY);
 // This was a com.sun.star.drawing.CustomShape, due to incorrect handling 
of wpg elements after a wps textbox.
 CPPUNIT_ASSERT_EQUAL(OUString(com.sun.star.drawing.GroupShape), 
xShapeDescriptor-getShapeType());
+
+// Now check the top right textbox.
+uno::Referencecontainer::XIndexAccess xGroup(getShape(2), 
uno::UNO_QUERY);
+uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xGroup-getByIndex(1), 
uno::UNO_QUERY)-getText();
+uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1, xText, 
[Year]);
+CPPUNIT_ASSERT_EQUAL(48.f, getPropertyfloat(getRun(xParagraph, 1), 
CharHeight));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
getPropertysal_Int32(getRun(xParagraph, 1), CharColor));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
commit f6c592b5e1722bd5b77de11c08d649b352f6e620
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 11:20:36 2013 +0100

drawingml import: read w:sz

Change-Id: I40293a0b612b50d5da3d736f567310525608b308

diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index d077b4d..405957c 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -130,6 +130,27 @@ ContextHandlerRef 
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
 case A_TOKEN( hlinkClick ): // CT_Hyperlink
 case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink
 return new HyperLinkContext( *this, rAttribs,  
mrTextCharacterProperties.maHyperlinkPropertyMap );
+case OOX_TOKEN( doc, rFonts ):
+break;
+case OOX_TOKEN( doc, b ):
+break;
+case OOX_TOKEN( doc, bCs ):
+break;
+case OOX_TOKEN( doc, color ):
+break;
+case OOX_TOKEN( doc, sz ):
+if (rAttribs.getInteger(OOX_TOKEN(doc, val)).has())
+{
+sal_Int32 nVal = rAttribs.getInteger(OOX_TOKEN(doc, 
val)).get();
+// wml has half points, dml has hundred points
+mrTextCharacterProperties.moHeight = nVal * 50;
+}
+break;
+case OOX_TOKEN( doc, szCs ):
+break;
+default:
+SAL_WARN(oox, TextCharacterPropertiesContext::onCreateContext: 
unhandled element:   getBaseToken(aElementToken));
+break;
 }
 
 return this;
commit 9b531abb6179a9f7f9cf4c745dba5060397425c6
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 10:22:44 2013 +0100

drawingml import: read w:rPr

Change-Id: I4405f9bc073b6e0b8c0426561ae9d01d91efdd59

diff --git a/oox/source/drawingml/textbodycontext.cxx 
b/oox/source/drawingml/textbodycontext.cxx
index 6d33fe3..d274d5a 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -135,11 +135,15 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( 
sal_Int32 aElementToke
 switch( aElementToken )
 {
 case A_TOKEN( rPr ):// CT_TextCharPropertyBag The text char 
properties of this text run.
+case OOX_TOKEN( doc, rPr ):
 return new TextCharacterPropertiesContext( *this, rAttribs, 

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

[Matúš Kukan]

 solenv/gbuild/UIConfig.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2249abc8d313bedce8f6de20ea0f49b512ed5da0
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Wed Dec 4 17:09:33 2013 +0100

Do not compress .ui translations in .zip files.

Using zip files reduce the file count in installer.
Uncompressed zip files can be compressed better by
packaging, thus we reduce the size of final package.

Change-Id: Id7c5ee9e302de325a29702b4e64301dc7102b2cf
Reviewed-on: https://gerrit.libreoffice.org/6938
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index f8c6e85..5588234 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -228,6 +228,7 @@ endef
 
 define gb_UIConfig__UIConfig_for_lang
 $(call gb_Zip_Zip_internal,$(call 
gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)/$(1))
+$(call gb_Zip_add_commandoptions,$(call 
gb_UIConfig_get_zipname_for_lang,$(1),$(2)),--suffixes .ui)
 $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) : 
$(SRCDIR)/solenv/gbuild/UIConfig.mk
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32419] When inserted on Writer, get Base size for formulas from underlining paragraph

[bugzilla-daemon]

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

--- Comment #8 from Niklas Johansson sleeping.pil...@gmail.com ---
Yury, please use the users list or Ask for these types of questions. 

Since you asked I'll answer this time. Use range instead of xrange. This is
because xrange no longer exist in Python 3.3 which is the version bundled with
LibreOffice 4.1. 

For more information see http://docs.python.org/3/whatsnew/3.0.html

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - include/xmlreader scp2/inc scp2/macros scp2/source solenv/bin solenv/gbuild vcl/source xmlreader/source

[Matúš Kukan]

 include/xmlreader/xmlreader.hxx |2 +
 scp2/inc/macros.inc |8 ++---
 scp2/macros/macro.pl|   16 +++
 scp2/source/ooo/file_library_ooo.scp|2 -
 scp2/source/ooo/file_ooo.scp|   40 ++--
 scp2/source/ooo/ure.scp |4 +-
 scp2/source/python/file_python.scp  |2 -
 solenv/bin/modules/installer/scriptitems.pm |2 -
 solenv/gbuild/UIConfig.mk   |   31 +++--
 solenv/gbuild/Zip.mk|   29 
 vcl/source/window/builder.cxx   |   35 
 xmlreader/source/xmlreader.cxx  |   14 +
 12 files changed, 131 insertions(+), 54 deletions(-)

New commits:
commit 56fdec9d62826380e954dfdcef28cb2139a47af5
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Wed Dec 4 17:09:33 2013 +0100

Do not compress .ui translations in .zip files.

Using zip files reduce the file count in installer.
Uncompressed zip files can be compressed better by
packaging, thus we reduce the size of final package.

Change-Id: Id7c5ee9e302de325a29702b4e64301dc7102b2cf
Reviewed-on: https://gerrit.libreoffice.org/6938
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 14d05c6..282b5f9 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -228,6 +228,7 @@ endef
 
 define gb_UIConfig__UIConfig_for_lang
 $(call gb_Zip_Zip_internal,$(call 
gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)/$(1))
+$(call gb_Zip_add_commandoptions,$(call 
gb_UIConfig_get_zipname_for_lang,$(1),$(2)),--suffixes .ui)
 $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) : 
$(SRCDIR)/solenv/gbuild/UIConfig.mk
 
 endef
commit 3503e9c048a9755b74f57ec91eeb4495476089b5
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Fri Dec 6 15:30:36 2013 +0100

scp2: hopefully fix Windows build

Change-Id: Ib4ead1d64dc6b8e76bf2c7bf0f007e8962acb1e2

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3e9983b..3cf19c2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -404,7 +404,7 @@ End
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
-Name = assembly/cli_cppuhelper.dll;
+Name = cli_cppuhelper.dll;
 Dir = SCP2_URE_DL_DIR;
 Assemblyname = cli_cppuhelper;
 PublicKeyToken = ce2cb7e279207b9e;
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index e4d5336..66e590d 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -60,7 +60,7 @@ End
 File gid_File_Py_Bin_Python
 BIN_FILE_BODY;
 #ifdef WNT
-Name = EXENAME(pyuno/python);
+Name = EXENAME(python);
 Dir = gid_Brand_Dir_Program;
 Styles = (PACKED);
 #else
commit 7fe9808f009af2f0a4da58663eacd2caccdcaafe
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Tue Dec 3 08:19:36 2013 +0100

Zip .ui translations per UIConfig target.

Fix installer / scp2 to not ignore directory prefix in 'Name'.

Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29
Reviewed-on: https://gerrit.libreoffice.org/6915
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index e895d8d..4ffc84e 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -39,6 +39,8 @@ namespace xmlreader {
 
 class OOO_DLLPUBLIC_XMLREADER XmlReader: private boost::noncopyable {
 public:
+XmlReader(char const *sStr, size_t nLength);
+
 explicit XmlReader(OUString const  fileUrl)
 SAL_THROW((
 com::sun::star::container::NoSuchElementException,
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 2f605a9..d95c364 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -481,12 +481,12 @@ End
 
 #include langmacros.inc
 
-#define UI_FILELIST_ALL_LANG(name, file, ext) \
+#define UI_FILELIST_ALL_LANG(name, file) \
 File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \
 TXT_FILE_BODY; \
-Styles = (FILELIST); \
-Dir = FILELIST_DIR; \
-EXTRA_ALL_LANG_BUT_EN_US(file, ext); \
+Styles = (PACKED); \
+Dir = gid_Dir_Share_Config_Sofficecfg; \
+UI_ALL_LANG_BUT_EN_US(file); \
 End
 
 #define URE_PRIVATE_LIB(id,name) \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 3ebeabe..3e7e415 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -50,6 +50,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_EXTRA_ALL_LANG();
 

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

[Andras Timar]

 configmgr/source/xcuparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93210ec3b3e7e773e998a3771136043748232f85
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Dec 8 22:55:57 2013 +0100

fdo#69027 check for state_.top().locked

Signed-off-by: Stephan Bergmann sberg...@redhat.com: I wonder why I 
originally
introduced State::locked in addition to State:ignored in the first place, 
but
can't find a good reason for that now. So the patch looks ok, though it 
could be
further simplified to completely get rid of State::locked. Will do that in a
follow-up commit.

Change-Id: If07a07b21effbf42918408a0b60b2d18bdc8665c

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e77025f..685cf0c 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -92,7 +92,7 @@ bool XcuParser::startElement(
  reader.getUrl()),
 css::uno::Reference css::uno::XInterface ());
 }
-} else if (state_.top().ignore) {
+} else if (state_.top().ignore || state_.top().locked) {
 state_.push(State(false));
 } else if (!state_.top().node.is()) {
 if (nsId == xmlreader::XmlReader::NAMESPACE_NONE  
name.equals(item))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configmgr/source

[Andras Timar]

 configmgr/source/xcuparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95fb63a111b8ee3a5ecfed3d5cce84df58abf8a6
Author: Andras Timar andras.ti...@collabora.com
Date:   Sun Dec 8 22:55:57 2013 +0100

fdo#69027 check for state_.top().locked

Signed-off-by: Stephan Bergmann sberg...@redhat.com: I wonder why I 
originally
introduced State::locked in addition to State:ignored in the first place, 
but
can't find a good reason for that now. So the patch looks ok, though it 
could be
further simplified to completely get rid of State::locked. Will do that in a
follow-up commit.

Change-Id: If07a07b21effbf42918408a0b60b2d18bdc8665c

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e77025f..685cf0c 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -92,7 +92,7 @@ bool XcuParser::startElement(
  reader.getUrl()),
 css::uno::Reference css::uno::XInterface ());
 }
-} else if (state_.top().ignore) {
+} else if (state_.top().ignore || state_.top().locked) {
 state_.push(State(false));
 } else if (!state_.top().node.is()) {
 if (nsId == xmlreader::XmlReader::NAMESPACE_NONE  
name.equals(item))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License

[Ulrich Kitzinger]

   All of my past  future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

Regards, 

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

developpement

[Atlas Informatique]

bonjour 
Je viens de decouvrir LibreOffice par un client.

Je voudrais savoir quel est le langage de programmation des macros pour la
base de données BASE.

Est-ce que le logiciel integre VBA comme ACCESS ?

Comment trouver de la documentation ?

 

Cordialement
---

Thierry BALENSI
ATLAS INFORMATIQUE

68 Bd Lazer 
13010 Marseille 
Tel : 06 260 240 81 - 09 53 43 90 11 - 04 84 25 31 66 
Fax : 09 58 43 90 11

atlasinformati...@free.fr

Skype : atlas.informatique

http://atlas.informatique.free.fr/

 

 

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

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

[Tor Lillqvist]

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

New commits:
commit 66338e11a48f600c63d37c3969ddb8b5a1188011
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 12:22:07 2013 +0200

Fix error in comment

Change-Id: I636da8b596e984ecadd13e5fe6a5b9a843ba3a81

diff --git a/include/basebmp/color.hxx b/include/basebmp/color.hxx
index 52451ff..b2d79b7 100644
--- a/include/basebmp/color.hxx
+++ b/include/basebmp/color.hxx
@@ -86,7 +86,7 @@ public:
+ getBlue()*getBlue()); }
 };
 
-} // namespace vigra
+} // namespace basebmp
 
 #endif /* INCLUDED_BASEBMP_COLOR_HXX */
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: fdo69552 backward compatibility with optional arguments in calc functions

[Winfried Donkers]

Hi Eike,

No, I proposed (or at least I think I did, that's what I meant anyway ;-)
to introduce a new / change the UI names, and only the UI names,
depending on the number of arguments encountered during reading a file.
There'll be only one CEILING for the file format and never another one.

(Just to make sure, I am a slow learner)
So, version 4.3 will have a CEILING in the UI, no diffence with previous 
versions and a CEILING_ODF in the UI which complies with ODF1.2.
Both will be saved in files as CEILING.
Upon reading a file (with version 4.3) the UI-function name will depend on the 
presence of argument 2 (regardless of the presence of argument 3).
And the object of this is that users of version 4.3 will not leave out argument 
2 unwittingly. (For users with older versions there is difference, the 
ODF1.2-compliant CEILING will produce an error if argument 2 is missing).

The hitch I see with this is that when a user creates a calc document, enters 
CEILING_ODF, saves and reopend, his function will be 'different' in the user's 
view.

And to be honest (don't confuse with blunt), how big is the gain of all this as 
compared to making CEILING comply with ODF1.2 in version 4.3? Users who don't 
read release notes and help will not know that argument 2 is now optional. By 
the time they discover this, older version that 4.3 will be really old and 4.3 
or newer will be commonly used. And should they read release notes or help, 
they will read that this change is not compatible with older version than 4.3.

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

Re: LibreOffice Gerrit News for core on 2013-12-09

[Eike Rathke]

Hi,

On Monday, 2013-12-09 06:00:02 -, ger...@libreoffice.org wrote:

  First time contributors doing great things ! 

There seems to be some bug in this thing, we have as first time
contributors:

Andrzej Hunt, Olivier Hallot, Laurent BP, Khaled Hosny, Markus Mohrhard,
Adam CloudOn

Last week Matúš Kukan and Marcos Souza were listed on several days.

  Eike

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


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

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

[Miklos Vajna]

 oox/source/drawingml/shapecontext.cxx   |   21 +---
 oox/source/drawingml/textcharacterpropertiescontext.cxx |1 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|3 ++
 3 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 826d133ccfdf20bb9e317715c726c4a562674b0b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 13:54:37 2013 +0100

drawingml import: handle w:b (found in docx groupshape textboxes)

Change-Id: I105d068a6b8d454fac963cd30f6f812cf2b96170

diff --git a/oox/source/drawingml/shapecontext.cxx 
b/oox/source/drawingml/shapecontext.cxx
index 7966482..cf844d3 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -114,6 +114,8 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 
aElementToken, const
 mpShapePtr-setTextBody( TextBodyPtr(new TextBody) );
 return new TextBodyPropertiesContext( *this, rAttribs, 
mpShapePtr-getTextBody()-getTextProperties() );
 break;
+case XML_txbx:
+break;
 default:
 SAL_WARN(oox, ShapeContext::onCreateContext: unhandled element:  
 getBaseToken(aElementToken));
 break;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 12362b9..d873c44 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -133,6 +133,7 @@ ContextHandlerRef 
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
 case OOX_TOKEN( doc, rFonts ):
 break;
 case OOX_TOKEN( doc, b ):
+mrTextCharacterProperties.moBold = rAttribs.getBool(OOX_TOKEN( 
doc, val ), true);
 break;
 case OOX_TOKEN( doc, bCs ):
 break;
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cc93d5b..5da974f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -11,6 +11,7 @@
 #if !defined(WNT)
 
 #include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/document/XEmbeddedObjectSupplier2.hpp
 #include com/sun/star/drawing/XControlShape.hpp
@@ -1614,6 +1615,7 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, mce-nested.docx)
 uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1, xText, 
[Year]);
 CPPUNIT_ASSERT_EQUAL(48.f, getPropertyfloat(getRun(xParagraph, 1), 
CharHeight));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
getPropertysal_Int32(getRun(xParagraph, 1), CharColor));
+CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getPropertyfloat(getRun(xParagraph, 1), CharWeight));
 CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, 
getPropertydrawing::TextVerticalAdjust(xGroup-getByIndex(1), 
TextVerticalAdjust));
 }
 
commit f5b3a728cec51cedc985e60bdd25f8f5484b7e14
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 13:35:39 2013 +0100

drawingml import: handle wps:bodyPr inside a groupshape

Change-Id: I1f059ae653ab13a7c867f77b2b1b4265e9e71b4e

diff --git a/oox/source/drawingml/shapecontext.cxx 
b/oox/source/drawingml/shapecontext.cxx
index 7d6971f..7966482 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -31,6 +31,7 @@
 #include oox/drawingml/drawingmltypes.hxx
 #include oox/drawingml/customshapegeometry.hxx
 #include oox/drawingml/textbodycontext.hxx
+#include oox/drawingml/textbodypropertiescontext.hxx
 #include hyperlinkcontext.hxx
 
 using namespace oox::core;
@@ -95,15 +96,27 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 
aElementToken, const
 case XML_txBody:
 case XML_txbxContent:
 {
-TextBodyPtr xTextBody( new TextBody );
-mpShapePtr-setTextBody( xTextBody );
-return new TextBodyContext( *this, *xTextBody );
+if (!mpShapePtr-getTextBody())
+mpShapePtr-setTextBody( TextBodyPtr(new TextBody) );
+return new TextBodyContext( *this, *mpShapePtr-getTextBody() );
 }
 case XML_txXfrm:
 {
 mpShapePtr-getTextBody()-getTextProperties().moRotation = 
rAttribs.getInteger( XML_rot );
 break;
 }
+case XML_cNvSpPr:
+break;
+case XML_spLocks:
+break;
+case XML_bodyPr:
+if (!mpShapePtr-getTextBody())
+mpShapePtr-setTextBody( TextBodyPtr(new TextBody) );
+return new TextBodyPropertiesContext( *this, rAttribs, 
mpShapePtr-getTextBody()-getTextProperties() );
+break;
+default:
+SAL_WARN(oox, ShapeContext::onCreateContext: unhandled element:  
 getBaseToken(aElementToken));
+break;
 }
 
 return this;
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7223179..cc93d5b 100644
--- 

Re: Packing from instdir (also: lets kill scp2!)

[bjoern]

Hi,

On Thu, Nov 21, 2013 at 06:03:36PM +0100, bjoern wrote:
  make packageinfo

Ok, I worked some more on this. The packageinfo for the l10n-${lang} and
help-${LANG} packages should be fine and usuable now(*). As such I added a:

make install-package-${PKG}

target available on master (and filed:

 https://gerrit.libreoffice.org/#/c/6982/

for backport to 4.2). So packager should now be able to e.g. do:

 make install-package-l10n-de 
INSTALLDIR=./debian/libreoffice-l10n-de/usr/lib/libreoffice

and therefore install parts in different directories for different packages,
which should simplify packing (and completely cuts nasty ol' scp2 out of the
loop here).

Best,

Bjoern

(*) The binary packages still require some addition
gb_Helper_register_for_install-foo in Repository.mk though. I dont plan to
use those for 4.2.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice Gerrit News for core on 2013-12-09

[bjoern]

On Mon, Dec 09, 2013 at 01:49:58PM +0100, Eike Rathke wrote:
 There seems to be some bug in this thing, we have as first time
 contributors:

Yeah, already noted AFAIK Mat (in CC) is already on it. Of course, patches are
welcome! ;)

Best,

Bjoern

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

Re: developpement

[Charles-H. Schulz]

Bonjour, 

Ceci est une liste de dévelopment anglophone. Je vous suggère d'essayer
http://fr.libreoffice.org et ses listes de discussion pour le Français.

Merci,

Charles-H. Schulz.

Le Wed, 4 Dec 2013 16:36:44 +0100,
Atlas Informatique atlasinformati...@free.fr a écrit :

 bonjour 
 Je viens de decouvrir LibreOffice par un client.
 
 Je voudrais savoir quel est le langage de programmation des macros
 pour la base de données BASE.
 
 Est-ce que le logiciel integre VBA comme ACCESS ?
 
 Comment trouver de la documentation ?
 
  
 
 Cordialement
 ---
 
 Thierry BALENSI
 ATLAS INFORMATIQUE
 
 68 Bd Lazer 
 13010 Marseille 
 Tel : 06 260 240 81 - 09 53 43 90 11 - 04 84 25 31 66 
 Fax : 09 58 43 90 11
 
 atlasinformati...@free.fr
 
 Skype : atlas.informatique
 
 http://atlas.informatique.free.fr/
 
  
 
  
 



-- 
Charles-H. Schulz 
Co-founder, The Document Foundation,
Kurfürstendamm 188, 10707 Berlin
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
Mobile Number: +33 (0)6 98 65 54 24.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Example in Java

[Adriam Delgado Rivero]

This is the error message: in line 99 (insertString)

Exception in thread main com.sun.star.lang.DisposedException
at 
com.sun.star.lib.uno.environments.remote.JobQueue.removeJob(JobQueue.java:214)
at 
com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:334)
at 
com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:307)
at 
com.sun.star.lib.uno.environments.remote.JavaThreadPool.enter(JavaThreadPool.java:91)
at 
com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:640)
at 
com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:150)
at 
com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:132)
at com.sun.proxy.$Proxy6.insertString(Unknown Source)
at Calendario.SWriter.main(SWriter.java:99)
Caused by: java.io.EOFException
at java.io.DataInputStream.readInt(DataInputStream.java:392)
at com.sun.star.lib.uno.protocols.urp.urp.readBlock(urp.java:359)
at com.sun.star.lib.uno.protocols.urp.urp.readMessage(urp.java:96)
at 
com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge$MessageDispatcher.run(java_remote_bridge.java:109)

slds
--

- Mensaje original -
De: Miklos Vajna vmik...@collabora.co.uk
Para: Adriam Delgado Rivero adriv...@uci.cu
CC: libreoffice@lists.freedesktop.org
Enviados: Lunes, 9 de Diciembre 2013 2:56:47
Asunto: Re: Example in Java

On Fri, Dec 06, 2013 at 04:21:16PM -0500, Adriam Delgado Rivero 
adriv...@uci.cu wrote:
 I'm watching the example 
 http://api.libreoffice.org/examples/java/Text/SWriter.java , and insertString 
 method does not work. This happens only with libreoffice 4. Works on 
 libreoffice 3.6, anyone knows passes, took almost a month with this. 

Hi,

What do you mean by does not work exactly? What is the error message
you get?

Miklos

III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 
2014. Ver www.uci.cu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 svx/source/unodraw/unomod.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa7c24e0e7b300fb7ac6ff7202a57eb1c60eb0b6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 14:58:29 2013 +0100

implicit conversion of NULL constant to 'bool' [-Werror,-Wnull-conversion]

...after 8a8981c603d2f45d0fac656e5b4b31bcabfabc92 GetBasic and m_pBasic are
unused.

Change-Id: I7ccfcdcc3a7b005185a1de3050f3cccbc741f073

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 150e2cc..0bf65e5 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -680,7 +680,7 @@ uno::Reference drawing::XDrawPage  SAL_CALL 
SvxUnoDrawPagesAccess::insertNewBy
 SdrPage* pPage;
 
 if( PTR_CAST( FmFormModel, mrModel.mpDoc ) )
-pPage = new FmFormPage(*(FmFormModel*)mrModel.mpDoc, NULL);
+pPage = new FmFormPage(*(FmFormModel*)mrModel.mpDoc);
 else
 pPage = new SdrPage(*mrModel.mpDoc);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 svx/source/dialog/dlgctl3d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44d476f509a883d6f6b5f9c90d45729ba93b6245
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 15:00:59 2013 +0100

implicit conversion of NULL constant to 'bool' [-Werror,-Wnull-conversion]

...after 8a8981c603d2f45d0fac656e5b4b31bcabfabc92 GetBasic and m_pBasic are
unused.

Change-Id: Ie491046b34668b0aaf499c057c35be21d8b81df9

diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 1e2c924..63a1949 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -89,7 +89,7 @@ void Svx3DPreviewControl::Construct()
 mpModel-GetItemPool().FreezeIdRanges();
 
 // Page
-mpFmPage = new FmFormPage( *mpModel, NULL );
+mpFmPage = new FmFormPage( *mpModel );
 mpModel-InsertPage( mpFmPage, 0 );
 
 // 3D View
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ulrich Kitzinger]

 svtools/source/graphic/grfmgr.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cc36dfc9bf4f327c359d171d8d05f0ede049164e
Author: Ulrich Kitzinger ulk...@hotmail.de
Date:   Sat Nov 30 21:19:31 2013 +0100

fdo#72156: GraphicObject: Added missing delete of stream

Change-Id: I1b84941b0e4b17d5819b1e4af0da9ce3f673710f
Signed-off-by: Ulrich Kitzinger ulk...@hotmail.de

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 89b6ead..f1c5955 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1160,7 +1160,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( 
const OUString rURL )
 {
 SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, 
STREAM_READ );
 if( pStream )
+{
 GraphicConverter::Import( *pStream, aGraphic );
+delete pStream;
+}
 }
 
 return GraphicObject( aGraphic );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ulrich Kitzinger]

 svtools/source/graphic/grfmgr.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f7b42987c4247244b23f0405fc5af58a92afd945
Author: Ulrich Kitzinger ulk...@hotmail.de
Date:   Sat Nov 30 21:19:31 2013 +0100

fdo#72156: GraphicObject: Added missing delete of stream

Change-Id: I1b84941b0e4b17d5819b1e4af0da9ce3f673710f
Signed-off-by: Ulrich Kitzinger ulk...@hotmail.de
(cherry picked from commit cc36dfc9bf4f327c359d171d8d05f0ede049164e)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 89b6ead..f1c5955 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1160,7 +1160,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( 
const OUString rURL )
 {
 SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, 
STREAM_READ );
 if( pStream )
+{
 GraphicConverter::Import( *pStream, aGraphic );
+delete pStream;
+}
 }
 
 return GraphicObject( aGraphic );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_sc_opencl_test clBuildProgram CL_BUILD_PROGRAM_FAILURE

[Stephan Bergmann]

On 12/09/2013 02:52 PM, Markus Mohrhard wrote:

It looks like another broken OpenCL compiler. So basically I'd need
from you the output of clinfo if available


is clinfo some command line tool?


or otherwise the generated file of
http://dev-www.libreoffice.org/opencl/Linux/ which hopefully runs on
Mac as well


surely not, http://dev-www.libreoffice.org/opencl/Linux/OpenCl-Info is 
an ELF executable; is the source available somewhere?


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

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

[Stephan Bergmann]

 sd/source/ui/framework/configuration/ResourceFactoryManager.hxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9f3e4bf8dcf11799c775a4d9bfd97732c65d454a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 14:54:51 2013 +0100

Missing includes

Change-Id: Ia9e8c05fedbb10eed347bbf357db73754e65a74c

diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx 
b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index 2c22df2..f7b7988 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -20,6 +20,11 @@
 #ifndef 
INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_RESOURCEFACTORYMANAGER_HXX
 #define 
INCLUDED_SD_SOURCE_UI_FRAMEWORK_CONFIGURATION_RESOURCEFACTORYMANAGER_HXX
 
+#include sal/config.h
+
+#include utility
+#include vector
+
 #include com/sun/star/drawing/framework/XControllerManager.hpp
 #include com/sun/star/drawing/framework/XModuleController.hpp
 #include com/sun/star/drawing/framework/XResourceFactoryManager.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ulrich Kitzinger]

 svtools/source/graphic/grfmgr.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 37ed490fd7bfef1863b26d0f791cba1a04811459
Author: Ulrich Kitzinger ulk...@hotmail.de
Date:   Sat Nov 30 21:19:31 2013 +0100

fdo#72156: GraphicObject: Added missing delete of stream

Change-Id: I1b84941b0e4b17d5819b1e4af0da9ce3f673710f
Signed-off-by: Ulrich Kitzinger ulk...@hotmail.de
(cherry picked from commit cc36dfc9bf4f327c359d171d8d05f0ede049164e)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 136aa57..9f14f3d 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1138,7 +1138,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( 
const OUString rURL )
 {
 SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, 
STREAM_READ );
 if( pStream )
+{
 GraphicConverter::Import( *pStream, aGraphic );
+delete pStream;
+}
 }
 
 return GraphicObject( aGraphic );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_sc_opencl_test clBuildProgram CL_BUILD_PROGRAM_FAILURE

[Markus Mohrhard]

Hey,


2013/12/9 Stephan Bergmann sberg...@redhat.com

 On 12/09/2013 02:52 PM, Markus Mohrhard wrote:

 It looks like another broken OpenCL compiler. So basically I'd need
 from you the output of clinfo if available


 is clinfo some command line tool?


Yes. It comes with some of the OpenCL platforms.



  or otherwise the generated file of
 http://dev-www.libreoffice.org/opencl/Linux/ which hopefully runs on
 Mac as well


 surely not, http://dev-www.libreoffice.org/opencl/Linux/OpenCl-Info is
 an ELF executable; is the source available somewhere?

 Stephan


The source code is at
http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/opencl . You
might need something like
http://opengrok.libreoffice.org/xref/core/sc/Library_scopencl.mk#58 for OSX.

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

Re: LibreOffice Gerrit News for core on 2013-12-09

[Stephan Bergmann]

On 12/09/2013 02:32 PM, bjoern wrote:

Of course, patches are welcome! ;)


No, they are apparently not, as long as they linger in git and don't get 
put into production.  ;)


Stephan

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

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

[Stephan Bergmann]

 configmgr/source/xcuparser.cxx |  152 +++--
 configmgr/source/xcuparser.hxx |   28 ---
 2 files changed, 88 insertions(+), 92 deletions(-)

New commits:
commit cf8a54e48c24b2b2b3ca31b0c2d2faef9f2fca0d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 9 14:55:39 2013 +0100

Get rid of redundant configmgr::XcuParser::State::locked

Change-Id: If7019fc334c0f11fae464b65c135d01acfb1a46b

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 685cf0c..f6f7f30 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -85,15 +85,15 @@ bool XcuParser::startElement(
 handleComponentData(reader);
 } else if (nsId == ParseManager::NAMESPACE_OOR  name.equals(items))
 {
-state_.push(State(rtl::Reference Node (), false));
+state_.push(State::Modify(rtl::Reference Node ()));
 } else {
 throw css::uno::RuntimeException(
 (bad root element  + name.convertFromUtf8() +  in  +
  reader.getUrl()),
 css::uno::Reference css::uno::XInterface ());
 }
-} else if (state_.top().ignore || state_.top().locked) {
-state_.push(State(false));
+} else if (state_.top().ignore) {
+state_.push(State::Ignore(false));
 } else if (!state_.top().node.is()) {
 if (nsId == xmlreader::XmlReader::NAMESPACE_NONE  
name.equals(item))
 {
@@ -171,7 +171,7 @@ bool XcuParser::startElement(
 configmgr,
 bad set node prop member in \  reader.getUrl()
  '');
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 } else {
 throw css::uno::RuntimeException(
 (bad set node member  + name.convertFromUtf8() +
@@ -298,7 +298,7 @@ void XcuParser::handleComponentData(xmlreader::XmlReader  
reader) {
 path_.push_back(componentName_);
 if (partial_ != 0  partial_-contains(path_) == 
Partial::CONTAINS_NOT)
 {
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 return;
 }
 }
@@ -310,7 +310,7 @@ void XcuParser::handleComponentData(xmlreader::XmlReader  
reader) {
 configmgr,
 unknown component \  componentName_  \ in \
  reader.getUrl()  '');
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 return;
 }
 switch (op) {
@@ -326,7 +326,11 @@ void XcuParser::handleComponentData(xmlreader::XmlReader  
reader) {
 finalized ? valueParser_.getLayer() : Data::NO_LAYER,
 node-getFinalized());
 node-setFinalized(finalizedLayer);
-state_.push(State(node, finalizedLayer  valueParser_.getLayer()));
+if (finalizedLayer  valueParser_.getLayer()) {
+state_.push(State::Ignore(true));
+return;
+}
+state_.push(State::Modify(node));
 }
 
 void XcuParser::handleItem(xmlreader::XmlReader  reader) {
@@ -355,7 +359,7 @@ void XcuParser::handleItem(xmlreader::XmlReader  reader) {
 SAL_WARN(
 configmgr,
 unknown item \  path  \ in \  reader.getUrl()  '');
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 return;
 }
 assert(!path_.empty());
@@ -363,7 +367,7 @@ void XcuParser::handleItem(xmlreader::XmlReader  reader) {
 if (trackPath_) {
 if (partial_ != 0  partial_-contains(path_) == 
Partial::CONTAINS_NOT)
 {
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 return;
 }
 } else {
@@ -376,7 +380,7 @@ void XcuParser::handleItem(xmlreader::XmlReader  reader) {
 configmgr,
 item of bad type \  path  \ in \  reader.getUrl()
  '');
-state_.push(State(true)); // ignored
+state_.push(State::Ignore(true));
 return;
 case Node::KIND_LOCALIZED_PROPERTY:
 valueParser_.type_ = dynamic_cast LocalizedPropertyNode * (
@@ -385,7 +389,11 @@ void XcuParser::handleItem(xmlreader::XmlReader  reader) {
 default:
 break;
 }
-state_.push(State(node, finalizedLayer  valueParser_.getLayer()));
+if (finalizedLayer  valueParser_.getLayer()) {
+state_.push(State::Ignore(true));
+return;
+}
+state_.push(State::Modify(node));
 }
 
 void XcuParser::handlePropValue(
@@ -447,13 +455,13 @@ void XcuParser::handlePropValue(
 css::uno::Reference css::uno::XInterface ());
 }
 prop-setValue(valueParser_.getLayer(), css::uno::Any());
-state_.push(State(false));
+state_.push(State::Ignore(false));
 } else if (external.isEmpty()) {
 valueParser_.separator_ = separator;
 valueParser_.start(prop);
  

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack target:4.2.0   |EasyHack target:4.2.0
   ||target:4.3.0

--- Comment #20 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=326aa3ff4d86c5709ae85ab71fd2c6828bbe7559

fdo#54938: Convert sc to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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/source sc/workben

[Marcos Paulo de Souza]

 sc/source/filter/oox/ooxformulaparser.cxx|7 +--
 sc/source/ui/Accessibility/AccessibleContextBase.cxx |   19 ++
 sc/source/ui/unoobj/addruno.cxx  |5 +-
 sc/source/ui/unoobj/celllistsource.cxx   |   15 +--
 sc/source/ui/unoobj/cellsuno.cxx |   36 ++-
 sc/source/ui/unoobj/cellvaluebinding.cxx |   16 +---
 sc/source/ui/unoobj/confuno.cxx  |   13 ++
 sc/source/ui/unoobj/cursuno.cxx  |5 +-
 sc/source/ui/unoobj/datauno.cxx  |8 +---
 sc/source/ui/unoobj/docuno.cxx   |9 ++--
 sc/source/ui/unoobj/exceldetect.cxx  |   10 +
 sc/source/ui/unoobj/fielduno.cxx |9 ++--
 sc/source/ui/unoobj/funcuno.cxx  |5 +-
 sc/source/ui/unoobj/miscuno.cxx  |3 +
 sc/source/ui/unoobj/nameuno.cxx  |4 +-
 sc/source/ui/unoobj/pageuno.cxx  |3 +
 sc/source/ui/unoobj/scdetect.cxx |   12 +-
 sc/source/ui/unoobj/shapeuno.cxx |   10 +
 sc/source/ui/unoobj/srchuno.cxx  |4 +-
 sc/source/ui/unoobj/styleuno.cxx |5 +-
 sc/source/ui/unoobj/viewuno.cxx  |5 +-
 sc/workben/addin.cxx |   20 +-
 22 files changed, 56 insertions(+), 167 deletions(-)

New commits:
commit 326aa3ff4d86c5709ae85ab71fd2c6828bbe7559
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Thu Dec 5 19:19:16 2013 -0200

fdo#54938: Convert sc to use cppu::supportsService

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

diff --git a/sc/source/filter/oox/ooxformulaparser.cxx 
b/sc/source/filter/oox/ooxformulaparser.cxx
index 6b80335..fac24f2 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -20,6 +20,7 @@
 #include ooxformulaparser.hxx
 
 #include com/sun/star/uno/XComponentContext.hpp
+#include cppuhelper/supportsservice.hxx
 #include formulaparser.hxx
 
 namespace oox {
@@ -132,7 +133,6 @@ OOXMLFormulaParser::~OOXMLFormulaParser()
 }
 
 // com.sun.star.lang.XServiceInfo interface ---
-
 OUString SAL_CALL OOXMLFormulaParser::getImplementationName() throw( 
RuntimeException )
 {
 return OOXMLFormulaParser_getImplementationName();
@@ -140,10 +140,7 @@ OUString SAL_CALL 
OOXMLFormulaParser::getImplementationName() throw( RuntimeExce
 
 sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString 
rService ) throw( RuntimeException )
 {
-const Sequence OUString  aServices( 
OOXMLFormulaParser_getSupportedServiceNames() );
-const OUString* pArray = aServices.getConstArray();
-const OUString* pArrayEnd = pArray + aServices.getLength();
-return ::std::find( pArray, pArrayEnd, rService ) != pArrayEnd;
+return cppu::supportsService(this, rService);
 }
 
 Sequence OUString  SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() 
throw( RuntimeException )
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx 
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 7db34ef..d81cacb 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -29,6 +29,7 @@
 #include svl/smplhint.hxx
 #include comphelper/sequence.hxx
 #include comphelper/servicehelper.hxx
+#include cppuhelper/supportsservice.hxx
 #include unotools/accessiblerelationsethelper.hxx
 #include vcl/unohelp.hxx
 #include comphelper/accessibleeventnotifier.hxx
@@ -462,28 +463,16 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent(
 }
 
 //=  XServiceInfo  
-
-OUString SAL_CALL
-   ScAccessibleContextBase::getImplementationName(void)
+OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void)
 throw (uno::RuntimeException)
 {
 return OUString(ScAccessibleContextBase);
 }
 
-sal_Bool SAL_CALL
- ScAccessibleContextBase::supportsService(const OUString sServiceName)
+sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString 
sServiceName)
 throw (uno::RuntimeException)
 {
-//  Iterate over all supported service names and return true if on of them
-//  matches the given name.
-uno::Sequence OUString aSupportedServices (
-getSupportedServiceNames ());
-sal_Int32 nLength(aSupportedServices.getLength());
-const OUString* pServiceNames = aSupportedServices.getConstArray();
-for (int i=0; inLength; ++i, ++pServiceNames)
-if (sServiceName == *pServiceNames)
-return sal_True;
-return false;
+return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence OUString SAL_CALL
diff --git 

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #21 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c4ebcc508576d9cf609a649d4d3d76d61eb

fdo#54938: Convert sd to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

Re: Example in Java

[Adriam Delgado Rivero]

this problem is in LIbreOffice 4.1.3.2 exactly and work perfect in Libreoffice 
3.6...
this code (http://api.libreoffice.org/examples/java/Text/SWriter.java  ) 
Does this code works for you in Libo4.1.3.2?

- Mensaje original -
De: Stephan Bergmann sberg...@redhat.com
Para: Adriam Delgado Rivero adriv...@uci.cu
CC: libreoffice@lists.freedesktop.org
Enviados: Lunes, 9 de Diciembre 2013 10:50:28
Asunto: Re: Example in Java

On 12/09/2013 02:59 PM, Adriam Delgado Rivero wrote:
 This is the error message: in line 99 (insertString)

 Exception in thread main com.sun.star.lang.DisposedException
   at 
 com.sun.star.lib.uno.environments.remote.JobQueue.removeJob(JobQueue.java:214)
   at 
 com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:334)
   at 
 com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:307)
   at 
 com.sun.star.lib.uno.environments.remote.JavaThreadPool.enter(JavaThreadPool.java:91)
   at 
 com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:640)
   at 
 com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:150)
   at 
 com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:132)
   at com.sun.proxy.$Proxy6.insertString(Unknown Source)
   at Calendario.SWriter.main(SWriter.java:99)
 Caused by: java.io.EOFException
   at java.io.DataInputStream.readInt(DataInputStream.java:392)
   at com.sun.star.lib.uno.protocols.urp.urp.readBlock(urp.java:359)
   at com.sun.star.lib.uno.protocols.urp.urp.readMessage(urp.java:96)
   at 
 com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge$MessageDispatcher.run(java_remote_bridge.java:109)

I cannot reproduce your problem, at least not when running that test 
from a recent master SDK on Linux,

   $ cd instdir/sdk
   $ ./setsdkenv_unix

   $ cd examples/java/Text
   $ make
   $ make SWriter.run

So, what is your platform (Linux, Windows, ...), what is your exact LO 
version, and how exactly do you run the test (from within the LO SDK, 
like how I did above)?

Stephan

III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 
2014. Ver www.uci.cu

III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 
2014. Ver www.uci.cu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk l10ntools/source

[Laurent Balland-Poirier]

 chart2/AllLangResTarget_chartcontroller.mk   |2 
 chart2/UIConfig_chart2.mk|1 
 chart2/source/controller/dialogs/ResourceIds.hrc |1 
 chart2/source/controller/dialogs/dlg_InsertTitle.cxx |8 
 chart2/source/controller/dialogs/dlg_InsertTitle.hrc |   25 -
 chart2/source/controller/dialogs/dlg_InsertTitle.src |   35 -
 chart2/source/controller/dialogs/res_Titles.cxx  |  231 ---
 chart2/source/controller/dialogs/res_Titles.hxx  |   30 -
 chart2/source/controller/inc/dlg_InsertTitle.hxx |4 
 chart2/uiconfig/ui/inserttitledlg.ui |  391 +++
 l10ntools/source/localize.cxx|2 
 11 files changed, 497 insertions(+), 233 deletions(-)

New commits:
commit cf38ab5d8929d99d70dcf517e1c795a3f6f90e9d
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Sat Dec 7 10:55:24 2013 +0100

Convert chart::InsertTitleDlg to .ui

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

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index be89120..7376f1df 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
 chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
 chart2/source/controller/dialogs/dlg_InsertLegend.src \
-chart2/source/controller/dialogs/dlg_InsertTitle.src \
 chart2/source/controller/dialogs/dlg_ShapeFont.src \
 chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
 chart2/source/controller/dialogs/dlg_View3D.src \
@@ -68,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_templates,chart2/res,\
 chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc \
 chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc \
 chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc \
-chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 1481b20..e3d08d4 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
+   chart2/uiconfig/ui/inserttitledlg \
chart2/uiconfig/ui/smoothlinesdlg \
chart2/uiconfig/ui/steppedlinesdlg \
chart2/uiconfig/ui/titlerotationtabpage \
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc 
b/chart2/source/controller/dialogs/ResourceIds.hrc
index ddd03f4..b1cd827 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -30,7 +30,6 @@
 #define DLG_DATA_SOURCE 901
 #define DLG_DATA_DESCR  836
 #define DLG_LEGEND  835
-#define DLG_TITLE   834
 #define DLG_3D_VIEW 752
 #define DLG_SPLINE_PROPERTIES 904
 #define DLG_DATA_YERRORBAR  842
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx 
b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 7b484ea..d2ec167 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -18,7 +18,6 @@
  */
 
 #include dlg_InsertTitle.hxx
-#include dlg_InsertTitle.hrc
 #include res_Titles.hxx
 #include ResId.hxx
 #include ObjectNameProvider.hxx
@@ -27,14 +26,9 @@ namespace chart
 {
 
 SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData rInput )
-: ModalDialog(pWindow, SchResId(DLG_TITLE))
+: ModalDialog( pWindow, InsertTitleDialog, 
modules/schart/ui/inserttitledlg.ui )
 , m_apTitleResources( new TitleResources(this,true) )
-, aBtnOK(this, SchResId(BTN_OK))
-, aBtnCancel(this, SchResId(BTN_CANCEL))
-, aBtnHelp(this, SchResId(BTN_HELP))
 {
-FreeResource();
-
 this-SetText( ObjectNameProvider::getName(OBJECTTYPE_TITLE,true) );
 m_apTitleResources-writeToResources( rInput );
 }
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc 
b/chart2/source/controller/dialogs/dlg_InsertTitle.hrc
deleted file mode 100644
index 26a4e69..000
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.hrc
+++ /dev/null
@@ -1,25 +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 

[Libreoffice-commits] core.git: 2 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk

[Caolán McNamara]

 chart2/AllLangResTarget_chartcontroller.mk  |1 
 chart2/UIConfig_chart2.mk   |1 
 chart2/source/controller/dialogs/ResourceIds.hrc|1 
 chart2/source/controller/dialogs/Strings_AdditionalControls.src |   13 
 chart2/source/controller/dialogs/dlg_InsertTitle.cxx|   14 
 chart2/source/controller/dialogs/res_Titles.cxx |   37 
 chart2/source/controller/dialogs/res_Titles.hxx |   65 -
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |   76 -
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |   17 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src |   82 -
 chart2/source/controller/inc/HelpIds.hrc|1 
 chart2/source/controller/inc/dlg_InsertTitle.hxx|9 
 chart2/source/controller/inc/res_Titles.hxx |   66 +
 chart2/uiconfig/ui/wizelementspage.ui   |  493 
++
 14 files changed, 633 insertions(+), 243 deletions(-)

New commits:
commit 28de078a73ad5f8effa7de8b60db2f4cbed14f2a
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 16:16:50 2013 +

missing string resources

regression since 1a404132d94af93d99b2ab65185d2c1b3efd78d4

Change-Id: Ied3080d101783e14e3e620d7cd00b7b482a1a8af

diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src 
b/chart2/source/controller/dialogs/Strings_AdditionalControls.src
index 71c007c..1f6f7a1 100644
--- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src
+++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src
@@ -18,6 +18,19 @@
  */
 #include Strings.hrc
 
+String STR_3DSCHEME_SIMPLE
+{
+Text [ en-US ] = Simple;
+};
+String STR_3DSCHEME_REALISTIC
+{
+Text [ en-US ] = Realistic;
+};
+String STR_3DSCHEME_CUSTOM
+{
+Text [ en-US ] = Custom;
+};
+
 String STR_BAR_GEOMETRY
 {
 Text [ en-US ] = Shape;
commit 98e135931a64025c728b2949eaaa8c5c70c97a2f
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 15:35:32 2013 +

convert chart elements page to .ui

Change-Id: I7b6dba29622dc1eaa7e12c58084c6ffed19fe886

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 7376f1df..5a64ac8 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/tp_PointGeometry.src \
 chart2/source/controller/dialogs/tp_PolarOptions.src \
 chart2/source/controller/dialogs/tp_RangeChooser.src \
-chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
 ))
 
 $(eval $(call gb_SrsTarget_add_nonlocalized_files,chart2/res,\
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index e3d08d4..7bf377e 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
chart2/uiconfig/ui/tp_Trendline \
+   chart2/uiconfig/ui/wizelementspage \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc 
b/chart2/source/controller/dialogs/ResourceIds.hrc
index b1cd827..fa61cce 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -49,7 +49,6 @@
 #define TP_AXIS_POSITIONS   904
 #define TP_CHARTTYPE910
 #define TP_RANGECHOOSER 911
-#define TP_WIZARD_TITLEANDOBJECTS 912
 #define TP_DATA_SOURCE  914
 
 #define TP_3D_SCENEGEOMETRY 915
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx 
b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index d2ec167..5e5c83d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -26,20 +26,16 @@ namespace chart
 {
 
 SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData rInput )
-: ModalDialog( pWindow, InsertTitleDialog, 
modules/schart/ui/inserttitledlg.ui )
-, m_apTitleResources( new TitleResources(this,true) )
-{
-this-SetText( ObjectNameProvider::getName(OBJECTTYPE_TITLE,true) );
-m_apTitleResources-writeToResources( rInput );
-}
-
-SchTitleDlg::~SchTitleDlg()
+: ModalDialog(pWindow, InsertTitleDialog, 
modules/schart/ui/inserttitledlg.ui)
+, m_xTitleResources(new TitleResources(*this, true))
 {
+SetText( ObjectNameProvider::getName(OBJECTTYPE_TITLE, true));
+m_xTitleResources-writeToResources( rInput );
 }
 
 void SchTitleDlg::getResult( TitleDialogData rOutput )
 {
-m_apTitleResources-readFromResources( rOutput );
+m_xTitleResources-readFromResources( rOutput );
 }
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx 

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #22 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=2f50ce6cfab2871cd879c1429e1938d3642616ef

fdo#54938: Convert sw to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #23 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=66b602e2315f91faf4c28ea9b72bfe188e0eec9c

fdo#54938: Convert io to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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 - chart2/source helpcontent2

[Caolán McNamara]

 chart2/source/controller/dialogs/res_Titles.hrc   |   41 -
 chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc |  143 --
 chart2/source/controller/inc/HelpIds.hrc  |   15 -
 helpcontent2  |2 
 4 files changed, 1 insertion(+), 200 deletions(-)

New commits:
commit ad0a87f71e1b1b59febfccd956fde5c365c28813
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 16:46:30 2013 +

drop unused helpds ids and macros

Change-Id: I3f957fe2fbe731c5d8847cfdd518e0593a615339

diff --git a/chart2/source/controller/dialogs/res_Titles.hrc 
b/chart2/source/controller/dialogs/res_Titles.hrc
deleted file mode 100644
index 5ba5916..000
--- a/chart2/source/controller/dialogs/res_Titles.hrc
+++ /dev/null
@@ -1,41 +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 .
- */
-#ifndef _CHART2_RES_TITLES_HRC
-#define _CHART2_RES_TITLES_HRC
-
-#define ED_MAINTITLE1
-#define ED_SUBTITLE 2
-#define ED_X_AXIS   3
-#define ED_Y_AXIS   4
-#define ED_Z_AXIS   5
-#define ED_SECONDARY_X_AXIS   6
-#define ED_SECONDARY_Y_AXIS   7
-#define FT_MAINTITLE1
-#define FT_SUBTITLE 2
-#define FT_TITLE_X_AXIS 3
-#define FT_TITLE_Y_AXIS 4
-#define FT_TITLE_Z_AXIS 5
-#define FT_TITLE_SECONDARY_X_AXIS 6
-#define FT_TITLE_SECONDARY_Y_AXIS 7
-#define FL_AXES 1
-#define FL_SECONDARY_AXES 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc 
b/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
deleted file mode 100644
index b3451ca..000
--- a/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
+++ /dev/null
@@ -1,143 +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 .
- */
-#ifndef _CHART2_RES_TITLES_SRC
-#define _CHART2_RES_TITLES_SRC
-
-#include res_Titles.hrc
-#include HelpIds.hrc
-
-#define TITLES_HEIGHT 12
-#define indentLabel 3
-#define fixedLinesHeight RSC_CD_FIXEDLINE_HEIGHT
-
-#define TITLES( xpos, ypos, availableWidth, indentLabel, fixedLinesHeight ) \
-Edit ED_MAINTITLE \
-{ \
-HelpID = HID_SCH_TITLE_MAIN; \
-Border = TRUE ; \
-Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 
, ypos  ) ; \
-Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) 
; \
-TabStop = TRUE ; \
-}; \
-Edit ED_SUBTITLE \
-{ \
-HelpID = HID_SCH_TITLE_SUB; \
-Border = TRUE ; \
-Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 
, ypos+TITLES_HEIGHT+4 ) ; \
-Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) 
; \
-TabStop = TRUE ; \
-}; \
-Edit ED_X_AXIS \
-{ \
-HelpID = HID_SCH_TITLE_X; \
-Border = TRUE ; \
-Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 
, ypos+2*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3)  ) ; \
-Size = MAP_APPFONT ( (availableWidth-2*indentLabel-4)/2 , TITLES_HEIGHT ) 
; \
-TabStop = TRUE ; \
-}; \
-Edit ED_Y_AXIS \
-{ \
-HelpID = HID_SCH_TITLE_Y; \
-Border = TRUE ; \
-Pos = MAP_APPFONT ( xpos+indentLabel+(availableWidth-2*indentLabel-4)/2+4 
, ypos+3*(TITLES_HEIGHT+4)+4+(fixedLinesHeight+3)  ) ; \
-Size = MAP_APPFONT ( 

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

[Caolán McNamara]

 helpers/help_hid.lst |4 ---
 source/text/schart/01/0402.xhp   |   16 
 source/text/schart/01/wiz_chart_elements.xhp |   35 ---
 3 files changed, 22 insertions(+), 33 deletions(-)

New commits:
commit 709409b5a4b5f77127fdd6f9669f39530b382b63
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 16:45:03 2013 +

update helpids for chart wizard title page .ui conversion

Change-Id: I3b3a5a75e1f773031df895ac753b623977179a77

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7be6ac7..4ca69ec 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3073,10 +3073,6 @@ HID_SCH_TBI_DATA_SWAP_ROW,63308,
 HID_SCH_TBX_DATA,63314,
 HID_SCH_TEXTDIRECTION,63395,
 HID_SCH_TEXTDIRECTION_EQUATION,63397,
-HID_SCH_TITLE_MAIN,63360,
-HID_SCH_TITLE_SECONDARY_X,63372,
-HID_SCH_TITLE_SECONDARY_Y,63373,
-HID_SCH_TITLE_SUB,63361,
 HID_SCH_TITLE_X,63362,
 HID_SCH_TITLE_Y,63363,
 HID_SCH_TITLE_Z,63364,
diff --git a/source/text/schart/01/0402.xhp 
b/source/text/schart/01/0402.xhp
index 5118331..355f3a1 100644
--- a/source/text/schart/01/0402.xhp
+++ b/source/text/schart/01/0402.xhp
@@ -55,29 +55,25 @@
 /table
 
 /section
-!-- removed HID SCH_CHECKBOX_DLG_LEGEND_CBX_SHOW --
+bookmark xml-lang=en-US branch=hid/modules/schart/ui/wizelementspage/show 
id=bm_id1106200811535390 localize=false/
 paragraph role=heading id=hd_id3155114 xml-lang=en-US level=3 
l10n=U oldref=6Display/paragraph
-paragraph role=paragraph id=par_id3150206 xml-lang=en-US l10n=U 
oldref=7ahelp hid=SCH_CHECKBOX_DLG_LEGEND_CBX_SHOWSpecifies whether to 
display a legend for the chart./ahelp This option is only visible if you call 
the dialog by choosing emphInsert - Legend/emph./paragraph
+paragraph role=paragraph id=par_id3150206 xml-lang=en-US l10n=U 
oldref=7ahelp hid=modules/schart/ui/wizelementspage/showSpecifies 
whether to display a legend for the chart./ahelp This option is only visible 
if you call the dialog by choosing emphInsert - Legend/emph./paragraph
 paragraph role=heading id=hd_id3150201 xml-lang=en-US level=2 
l10n=U oldref=4Position/paragraph
 paragraph role=paragraph id=par_id3155376 xml-lang=en-US l10n=U 
oldref=5Select the position for the legend:/paragraph
-!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_LEFT --
 bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/left 
id=bm_id1106200811535391 localize=false/
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_LEFT 
id=bm_id1106200811535392 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/schart/ui/wizelementspage/left 
id=bm_id1106200811535392 localize=false/
 paragraph role=heading id=hd_id3152988 xml-lang=en-US level=3 
l10n=U oldref=8Left/paragraph
 paragraph role=paragraph id=par_id3155087 xml-lang=en-US l10n=U 
oldref=9ahelp hid=schart/ui/tp_LegendPosition/leftPositions the legend 
at the left of the chart./ahelp/paragraph
-!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_TOP --
 bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/top 
id=bm_id1106200811535393 localize=false/
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_TOP 
id=bm_id8514053 localize=false/
+bookmark xml-lang=en-US branch=hid/modules/schart/ui/wizelementspage/top 
id=bm_id8514053 localize=false/
 paragraph role=heading id=hd_id3153816 xml-lang=en-US level=3 
l10n=U oldref=10Top/paragraph
 paragraph role=paragraph id=par_id3153912 xml-lang=en-US l10n=U 
oldref=11ahelp hid=schart/ui/tp_LegendPosition/topPositions the legend 
at the top of the chart./ahelp/paragraph
-!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_RIGHT --
 bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/right 
id=bm_id1106200811535394 localize=false/
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_RIGHT 
id=bm_id5492721 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/wizelementspage/right id=bm_id5492721 
localize=false/
 paragraph role=heading id=hd_id3144773 xml-lang=en-US level=3 
l10n=U oldref=12Right/paragraph
 paragraph role=paragraph id=par_id3155268 xml-lang=en-US l10n=U 
oldref=13ahelp hid=schart/ui/tp_LegendPosition/rightPositions the legend 
at the right of the chart./ahelp/paragraph
-!-- removed HID SCH:RADIOBUTTON:DLG_LEGEND:RBT_BOTTOM --
 bookmark xml-lang=en-US branch=modules/schart/ui/tp_LegendPosition/bottom 
id=bm_id1106200811535395 localize=false/
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_LEGEND_POS_BOTTOM 
id=bm_id445570 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/wizelementspage/bottom id=bm_id445570 
localize=false/
 paragraph role=heading id=hd_id3152871 xml-lang=en-US level=3 
l10n=U oldref=14Bottom/paragraph
 paragraph role=paragraph id=par_id3153249 xml-lang=en-US l10n=U 
oldref=15ahelp hid=schart/ui/tp_LegendPosition/bottomPositions the 
legend at the bottom of the chart./ahelp/paragraph
 paragraph role=heading id=hd_id1106200812072645 

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

[Ulrich Kitzinger]

 svtools/source/graphic/grfmgr.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fffa2b69209f9c1387a6182ca1422aa3f71c1cae
Author: Ulrich Kitzinger ulk...@hotmail.de
Date:   Sat Nov 30 21:19:31 2013 +0100

fdo#72156: GraphicObject: Added missing delete of stream

Change-Id: I1b84941b0e4b17d5819b1e4af0da9ce3f673710f
Signed-off-by: Ulrich Kitzinger ulk...@hotmail.de
(cherry picked from commit cc36dfc9bf4f327c359d171d8d05f0ede049164e)
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 37ed490fd7bfef1863b26d0f791cba1a04811459)
Reviewed-on: https://gerrit.libreoffice.org/7010
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 136aa57..9f14f3d 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1138,7 +1138,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( 
const OUString rURL )
 {
 SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, 
STREAM_READ );
 if( pStream )
+{
 GraphicConverter::Import( *pStream, aGraphic );
+delete pStream;
+}
 }
 
 return GraphicObject( aGraphic );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source dbaccess/source desktop/source extensions/source framework/source sc/source sfx2/source svx/source toolkit/source vcl/unx

[Noel Grandin]

 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx|4 
 dbaccess/source/core/api/FilteredContainer.cxx   |4 
 dbaccess/source/ui/dlg/tablespage.cxx|2 
 desktop/source/migration/migration.cxx   |2 
 extensions/source/update/feed/updatefeed.cxx |2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx |   38 +++---
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx  |   26 ++--
 framework/source/uielement/imagebuttontoolbarcontroller.cxx  |6 -
 framework/source/uielement/spinfieldtoolbarcontroller.cxx|   32 ++---
 framework/source/uielement/togglebuttontoolbarcontroller.cxx |   26 ++--
 framework/source/uielement/toolbarwrapper.cxx|2 
 framework/source/uifactory/addonstoolboxfactory.cxx  |6 -
 sc/source/core/tool/formulaopt.cxx   |4 
 sc/source/filter/xml/XMLTrackedChangesContext.cxx|2 
 sc/source/filter/xml/xmlcvali.cxx|4 
 sc/source/filter/xml/xmlexprt.cxx|2 
 sc/source/ui/app/inputhdl.cxx|   32 ++---
 sfx2/source/control/unoctitm.cxx |   10 -
 svx/source/xoutdev/xattr.cxx |4 
 toolkit/source/controls/dialogcontrol.cxx|2 
 toolkit/source/controls/unocontrol.cxx   |   14 +-
 vcl/unx/generic/dtrans/X11_selection.cxx |   10 -
 xmloff/source/draw/XMLImageMapExport.cxx |2 
 xmloff/source/script/XMLEventExport.cxx  |2 
 xmloff/source/text/txtflde.cxx   |   64 +--
 xmloff/source/text/txtparae.cxx  |3 
 26 files changed, 148 insertions(+), 157 deletions(-)

New commits:
commit ee107cd95b4e449391da5f1fe9246682bcf1e6ce
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 9 12:51:35 2013 +0200

fix equalsAscii conversion. Noticed in fdo#72391

In commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3
convert equalsAsciiL calls to startWith calls where possible
I incorrectly converted equalsAsciiL calls to startsWith calls.
This commit fixes those places to use the == OUString operator.

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

diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx 
b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index c257a39..f563c51 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -135,7 +135,7 @@ Reference XResultSet  SAL_CALL 
java_sql_DatabaseMetaData::getTables(
 bool bIncludeAllTypes = false;
 for ( sal_Int32 i=0; itypeFilterCount; ++i, ++typeFilter )
 {
-if ( typeFilter-startsWith( % ) )
+if ( *typeFilter == % )
 {
 bIncludeAllTypes = true;
 break;
@@ -163,7 +163,7 @@ Reference XResultSet  SAL_CALL 
java_sql_DatabaseMetaData::getTables(
 aCatalogFilter = m_pConnection-getCatalogRestriction();
 // similar for schema
 Any aSchemaFilter;
-if ( schemaPattern.startsWith( % ) )
+if ( schemaPattern == % )
 aSchemaFilter = m_pConnection-getSchemaRestriction();
 else
 aSchemaFilter = schemaPattern;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index dfa656c..7e5de81 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -168,7 +168,7 @@ sal_Int32 createWildCardVector(Sequence OUString  
_rTableFilter, ::std::vecto
 
 // first, filter for the table names
 sal_Int32 nTableFilterCount = _tableFilter.getLength();
-sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 )  
_tableFilter[0].startsWith( % ) );
+sal_Bool dontFilterTableNames = ( ( nTableFilterCount == 1 )  
_tableFilter[0] == % );
 if( dontFilterTableNames )
 {
 aFilteredTables = _unfilteredTables;
@@ -198,7 +198,7 @@ sal_Int32 createWildCardVector(Sequence OUString  
_rTableFilter, ::std::vecto
 
 // second, filter for the table types
 sal_Int32 nTableTypeFilterCount = _tableTypeFilter.getLength();
-sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 )  
_tableTypeFilter[0].startsWith( % ) );
+sal_Bool dontFilterTableTypes = ( ( nTableTypeFilterCount == 1 )  
_tableTypeFilter[0] == % );
 dontFilterTableTypes = dontFilterTableTypes || ( nTableTypeFilterCount 
== 0 );
 // 

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

[Khaled Hosny]

 sw/source/core/txtnode/fntcache.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b79b4b88c5eb6b0fe4092b5eb98f3088f316f7b2
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Dec 8 22:30:28 2013 +0200

fdo#72488: Broken text when showing visible space

Turning on showing nonprinting characters replaces the space with bullet
character, but still draws the text with the original kern array, this
works fine until there are ligatures involving the space character as
the number of glyphs after replacing the space with the bullet will be
different and the kern array will be completely off.

This is a hack that gives up on replacing the space with a bullet when
its width is zero, not sure if it would interfere with other legitimate
uses.

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

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 80b2ea8..0857604 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1531,7 +1531,13 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 
 for( sal_Int32 i = 0; i  aStr.getLength(); ++i )
 if( CH_BLANK == aStr[ i ] )
-aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+{
+/* fdo#72488 Hack: try to see if the space is zero width
+ * and don't bother with inserting a bullet in this case.
+ */
+if (pKernArray[i + nCopyStart] != pKernArray[ i + 
nCopyStart + 1])
+aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+}
 }
 
 xub_StrLen nCnt = rInf.GetText().getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 sw/source/core/txtnode/fntcache.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8351eb25302a28c70ef5b2aaa1189db949dcf443
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Dec 8 22:30:28 2013 +0200

fdo#72488: Broken text when showing visible space

Turning on showing nonprinting characters replaces the space with bullet
character, but still draws the text with the original kern array, this
works fine until there are ligatures involving the space character as
the number of glyphs after replacing the space with the bullet will be
different and the kern array will be completely off.

This is a hack that gives up on replacing the space with a bullet when
its width is zero, not sure if it would interfere with other legitimate
uses.

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

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 0f882dc..0ccbbc6 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1569,7 +1569,13 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
 
 for( sal_Int32 i = 0; i  aStr.getLength(); ++i )
 if( CH_BLANK == aStr[ i ] )
-aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+{
+/* fdo#72488 Hack: try to see if the space is zero width
+ * and don't bother with inserting a bullet in this case.
+ */
+if (pKernArray[i + nCopyStart] != pKernArray[ i + 
nCopyStart + 1])
+aStr = aStr.replaceAt(i, 1, OUString(CH_BULLET));
+}
 }
 
 sal_Int32 nCnt = rInf.GetText().getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marcos Paulo de Souza]

 starmath/source/accessibility.cxx |   11 +++
 starmath/source/unomodel.cxx  |6 ++
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit b4b623c10ca4dbb94cdd7fd8189b40e50fbf9b6e
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Thu Dec 5 12:51:11 2013 -0200

fdo#54938: Convert starmath to use cppu::supportsService

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

diff --git a/starmath/source/accessibility.cxx 
b/starmath/source/accessibility.cxx
index f80f1c6..7b6a2c4 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -26,12 +26,12 @@
 #include com/sun/star/awt/XFocusListener.hpp
 #include unotools/accessiblerelationsethelper.hxx
 
-
 #include com/sun/star/datatransfer/clipboard/XClipboard.hpp
 #include com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp
 #include com/sun/star/i18n/WordType.hpp
 #include unotools/accessiblestatesethelper.hxx
 #include comphelper/accessibleeventnotifier.hxx
+#include cppuhelper/supportsservice.hxx
 #include osl/diagnose.h
 #include vcl/svapp.hxx
 #include vcl/window.hxx
@@ -794,10 +794,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
 const OUString rServiceName )
 throw (RuntimeException)
 {
-return  rServiceName == com::sun::star::accessibility::Accessible ||
-rServiceName == 
com::sun::star::accessibility::AccessibleComponent ||
-rServiceName == com::sun::star::accessibility::AccessibleContext 
||
-rServiceName == com::sun::star::accessibility::AccessibleText;
+return  cppu::supportsService(this, rServiceName);
 }
 
 Sequence OUString  SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
@@ -1945,9 +1942,7 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService(
 const OUString rServiceName )
 throw (RuntimeException)
 {
-return  rServiceName == com::sun::star::accessibility::Accessible ||
-rServiceName == 
com::sun::star::accessibility::AccessibleComponent ||
-rServiceName == com::sun::star::accessibility::AccessibleContext;
+return  cppu::supportsService(this, rServiceName);
 }
 
 Sequence OUString  SAL_CALL SmEditAccessible::getSupportedServiceNames()
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index c3b9a9d..bd06768 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -37,6 +37,7 @@
 #include rtl/ustrbuf.hxx
 #include comphelper/propertysetinfo.hxx
 #include comphelper/servicehelper.hxx
+#include cppuhelper/supportsservice.hxx
 #include unotools/moduleoptions.hxx
 
 #include unomodel.hxx
@@ -416,10 +417,7 @@ OUString SmModel::getImplementationName_Static()
 
 sal_Bool SmModel::supportsService(const OUString rServiceName) throw( 
uno::RuntimeException )
 {
-return (
-rServiceName == com.sun.star.document.OfficeDocument ||
-rServiceName == com.sun.star.formula.FormulaProperties
-   );
+return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence OUString  SmModel::getSupportedServiceNames(void) throw( 
uno::RuntimeException )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #24 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4b623c10ca4dbb94cdd7fd8189b40e50fbf9b6e

fdo#54938: Convert starmath to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

Re: Example in Java

[Stephan Bergmann]

On 12/09/2013 05:12 PM, Adriam Delgado Rivero wrote:

this problem is in LIbreOffice 4.1.3.2 exactly and work perfect in Libreoffice 
3.6...
this code (http://api.libreoffice.org/examples/java/Text/SWriter.java  )
Does this code works for you in Libo4.1.3.2?


Yes, works here with LO 4.1, too.  You still haven't told your platform 
and how exactly you build and run that test, though.


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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Khaled Hosny khaledho...@eglug.org changed:

   What|Removed |Added

 Depends on|72500   |

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

is the UIConfig folder in root of install direcotry correct? fdo#72451

[V Stuart Foote]

Seems like something didn't go quite right with recent refactoring of
UIConfiguration. From 7 Dec builds of master we've had a directory UIConfig
in the root of the install directory and we seem to be missing .UI
configuration details needed on launch--with Fatal Error resulting.

Have  fdo#72451 https://bugs.freedesktop.org/show_bug.cgi?id=72451   open.



--
View this message in context: 
http://nabble.documentfoundation.org/is-the-UIConfig-folder-in-root-of-install-direcotry-correct-fdo-72451-tp4087443.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tomaž Vajngerl]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |   37 +++
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit f464bb21c8e8483200feb159cfdf9e5bc29aa27f
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Dec 9 19:53:20 2013 +0100

fdo#72137 Allocate enough points in MovingAverageRegression calc.

Change-Id: I9ae058cad678cdb86709a4e40e3d4bd47900d386

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 1e6c96d..7432277 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -997,20 +997,15 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 xProperties-getPropertyValue( InterceptValue) = 
aInterceptValue;
 }
 
-double fMinX;
-double fMaxX;
-
 double fChartMinX = m_pPosHelper-getLogicMinX();
 double fChartMaxX = m_pPosHelper-getLogicMaxX();
 
+double fMinX = fChartMinX;
+double fMaxX = fChartMaxX;
+
 double fPointScale = 1.0;
 
-if( bAverageLine )
-{
-fMinX = fChartMinX;
-fMaxX = fChartMaxX;
-}
-else
+if( !bAverageLine )
 {
 rVDataSeries.getMinMaxXValue(fMinX, fMaxX);
 fMaxX += aExtrapolateForward;
@@ -1018,6 +1013,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 
 fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX);
 }
+
 xCalculator-setRegressionProperties(aDegree, aForceIntercept, 
aInterceptValue, aPeriod);
 xCalculator-recalculateRegression( rVDataSeries.getAllX(), 
rVDataSeries.getAllY() );
 sal_Int32 nPointCount = 100 * fPointScale;
@@ -1025,15 +1021,6 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 if ( nPointCount  2 )
 nPointCount = 2;
 
-drawing::PolyPolygonShape3D aRegressionPoly;
-aRegressionPoly.SequenceX.realloc(1);
-aRegressionPoly.SequenceY.realloc(1);
-aRegressionPoly.SequenceZ.realloc(1);
-aRegressionPoly.SequenceX[0].realloc(nPointCount);
-aRegressionPoly.SequenceY[0].realloc(nPointCount);
-aRegressionPoly.SequenceZ[0].realloc(nPointCount);
-sal_Int32 nRealPointCount=0;
-
 std::vector ExplicitScaleData  aScales( m_pPosHelper-getScales());
 uno::Reference chart2::XScaling  xScalingX;
 uno::Reference chart2::XScaling  xScalingY;
@@ -1048,7 +1035,19 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 fMinX, fMaxX, nPointCount,
 xScalingX, xScalingY, bMaySkipPoints ));
 
-for(sal_Int32 nP=0; nPaCalculatedPoints.getLength(); nP++)
+nPointCount = aCalculatedPoints.getLength();
+
+drawing::PolyPolygonShape3D aRegressionPoly;
+aRegressionPoly.SequenceX.realloc(1);
+aRegressionPoly.SequenceY.realloc(1);
+aRegressionPoly.SequenceZ.realloc(1);
+aRegressionPoly.SequenceX[0].realloc(nPointCount);
+aRegressionPoly.SequenceY[0].realloc(nPointCount);
+aRegressionPoly.SequenceZ[0].realloc(nPointCount);
+
+sal_Int32 nRealPointCount = 0;
+
+for(sal_Int32 nP = 0; nP  aCalculatedPoints.getLength(); ++nP)
 {
 double fLogicX = aCalculatedPoints[nP].X;
 double fLogicY = aCalculatedPoints[nP].Y;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |   37 +++
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 306d6d7f199067594378e2c9d084016d1442367a
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Dec 9 19:53:20 2013 +0100

fdo#72137 Allocate enough points in MovingAverageRegression calc.

Change-Id: I9ae058cad678cdb86709a4e40e3d4bd47900d386

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 44e4c58..a1749ce 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -997,20 +997,15 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 xProperties-getPropertyValue( InterceptValue) = 
aInterceptValue;
 }
 
-double fMinX;
-double fMaxX;
-
 double fChartMinX = m_pPosHelper-getLogicMinX();
 double fChartMaxX = m_pPosHelper-getLogicMaxX();
 
+double fMinX = fChartMinX;
+double fMaxX = fChartMaxX;
+
 double fPointScale = 1.0;
 
-if( bAverageLine )
-{
-fMinX = fChartMinX;
-fMaxX = fChartMaxX;
-}
-else
+if( !bAverageLine )
 {
 rVDataSeries.getMinMaxXValue(fMinX, fMaxX);
 fMaxX += aExtrapolateForward;
@@ -1018,6 +1013,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 
 fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX);
 }
+
 xCalculator-setRegressionProperties(aDegree, aForceIntercept, 
aInterceptValue, aPeriod);
 xCalculator-recalculateRegression( rVDataSeries.getAllX(), 
rVDataSeries.getAllY() );
 sal_Int32 nPointCount = 100 * fPointScale;
@@ -1025,15 +1021,6 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 if ( nPointCount  2 )
 nPointCount = 2;
 
-drawing::PolyPolygonShape3D aRegressionPoly;
-aRegressionPoly.SequenceX.realloc(1);
-aRegressionPoly.SequenceY.realloc(1);
-aRegressionPoly.SequenceZ.realloc(1);
-aRegressionPoly.SequenceX[0].realloc(nPointCount);
-aRegressionPoly.SequenceY[0].realloc(nPointCount);
-aRegressionPoly.SequenceZ[0].realloc(nPointCount);
-sal_Int32 nRealPointCount=0;
-
 std::vector ExplicitScaleData  aScales( m_pPosHelper-getScales());
 uno::Reference chart2::XScaling  xScalingX;
 uno::Reference chart2::XScaling  xScalingY;
@@ -1048,7 +1035,19 @@ void VSeriesPlotter::createRegressionCurvesShapes( 
VDataSeries rVDataSeries,
 fMinX, fMaxX, nPointCount,
 xScalingX, xScalingY, bMaySkipPoints ));
 
-for(sal_Int32 nP=0; nPaCalculatedPoints.getLength(); nP++)
+nPointCount = aCalculatedPoints.getLength();
+
+drawing::PolyPolygonShape3D aRegressionPoly;
+aRegressionPoly.SequenceX.realloc(1);
+aRegressionPoly.SequenceY.realloc(1);
+aRegressionPoly.SequenceZ.realloc(1);
+aRegressionPoly.SequenceX[0].realloc(nPointCount);
+aRegressionPoly.SequenceY[0].realloc(nPointCount);
+aRegressionPoly.SequenceZ[0].realloc(nPointCount);
+
+sal_Int32 nRealPointCount = 0;
+
+for(sal_Int32 nP = 0; nP  aCalculatedPoints.getLength(); ++nP)
 {
 double fLogicX = aCalculatedPoints[nP].X;
 double fLogicY = aCalculatedPoints[nP].Y;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   42 ++-
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |3 -
 2 files changed, 26 insertions(+), 19 deletions(-)

New commits:
commit cb56ab9bca5e917d86a7dc24eb144353c405f07c
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 20:22:26 2013 +0100

fdo#56443 allow different name for .dic and .aff files

For example, de_CH_frami.dic and de_AT_frami.dic use de_DE_frami.aff.

Change-Id: I1d3770ad871b4714f7e595e1cd13f5fd7f224a1f

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index e3a79df..bce00cc 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -66,7 +66,8 @@ SpellChecker::SpellChecker() :
 aDicts(NULL),
 aDEncs(NULL),
 aDLocs(NULL),
-aDNames(NULL),
+aDAffNames(NULL),
+aDDicNames(NULL),
 numdict(0),
 aEvtListeners(GetLinguMutex()),
 pPropHelper(NULL),
@@ -86,7 +87,8 @@ SpellChecker::~SpellChecker()
 }
 delete[] aDEncs;
 delete[] aDLocs;
-delete[] aDNames;
+delete[] aDAffNames;
+delete[] aDDicNames;
 if (pPropHelper)
 {
 pPropHelper-RemoveAsPropListener();
@@ -183,7 +185,8 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts  = new Hunspell* [numdict];
 aDEncs  = new rtl_TextEncoding [numdict];
 aDLocs  = new Locale [numdict];
-aDNames = new OUString [numdict];
+aDAffNames = new OUString [numdict];
+aDDicNames = new OUString [numdict];
 k = 0;
 for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
 {
@@ -201,13 +204,16 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts[k]  = NULL;
 aDEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
 aDLocs[k]  = LanguageTag::convertToLocale( 
aLocaleNames[i] );
-// also both files have to be in the same directory 
and the
-// file names must only differ in the extension 
(.aff/.dic).
-// Thus we use the first location only and strip the 
extension part.
-OUString aLocation = aDictIt-aLocations[0];
-sal_Int32 nPos = aLocation.lastIndexOf( '.' );
-aLocation = aLocation.copy( 0, nPos );
-aDNames[k] = aLocation;
+if ((aDictIt-aLocations[0]).endsWith(.aff))
+{
+aDAffNames[k] = aDictIt-aLocations[0];
+aDDicNames[k] = aDictIt-aLocations[1];
+}
+else
+{
+aDAffNames[k] = aDictIt-aLocations[1];
+aDDicNames[k] = aDictIt-aLocations[0];
+}
 
 ++k;
 }
@@ -225,8 +231,10 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDEncs = NULL;
 delete[] aDLocs;
 aDLocs  = NULL;
-delete[] aDNames;
-aDNames = NULL;
+delete[] aDAffNames;
+delete[] aDDicNames;
+aDAffNames = NULL;
+aDDicNames = NULL;
 aSuppLocales.realloc(0);
 }
 }
@@ -303,18 +311,16 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString 
rWord, const Locale rL
 {
 if (!aDicts[i])
 {
-OUString dicpath = aDNames[i] + .dic;
-OUString affpath = aDNames[i] + .aff;
 OUString dict;
 OUString aff;
-osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
-osl::FileBase::getSystemPathFromFileURL(affpath,aff);
+
osl::FileBase::getSystemPathFromFileURL(aDDicNames[i],dict);
+osl::FileBase::getSystemPathFromFileURL(aDAffNames[i],aff);
 OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
 OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
 
 #if defined(WNT)
-// workaround for Windows specifc problem that the
-// path length in calls to 'fopen' is limted to somewhat
+// workaround for Windows specific problem that the
+// path length in calls to 'fopen' is limited to somewhat
 // about 120+ characters which will usually be exceed when
 // using dictionaries as extensions.
 aTmpaff = Win_GetShortPathName( aff );
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 

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

[Andras Timar]

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   42 ++-
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |3 -
 2 files changed, 26 insertions(+), 19 deletions(-)

New commits:
commit 37f7a6b6c529140c827a875be7ad483a08e16631
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 20:22:26 2013 +0100

fdo#56443 allow different name for .dic and .aff files

For example, de_CH_frami.dic and de_AT_frami.dic use de_DE_frami.aff.

Change-Id: I1d3770ad871b4714f7e595e1cd13f5fd7f224a1f

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index e3a79df..bce00cc 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -66,7 +66,8 @@ SpellChecker::SpellChecker() :
 aDicts(NULL),
 aDEncs(NULL),
 aDLocs(NULL),
-aDNames(NULL),
+aDAffNames(NULL),
+aDDicNames(NULL),
 numdict(0),
 aEvtListeners(GetLinguMutex()),
 pPropHelper(NULL),
@@ -86,7 +87,8 @@ SpellChecker::~SpellChecker()
 }
 delete[] aDEncs;
 delete[] aDLocs;
-delete[] aDNames;
+delete[] aDAffNames;
+delete[] aDDicNames;
 if (pPropHelper)
 {
 pPropHelper-RemoveAsPropListener();
@@ -183,7 +185,8 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts  = new Hunspell* [numdict];
 aDEncs  = new rtl_TextEncoding [numdict];
 aDLocs  = new Locale [numdict];
-aDNames = new OUString [numdict];
+aDAffNames = new OUString [numdict];
+aDDicNames = new OUString [numdict];
 k = 0;
 for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
 {
@@ -201,13 +204,16 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts[k]  = NULL;
 aDEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
 aDLocs[k]  = LanguageTag::convertToLocale( 
aLocaleNames[i] );
-// also both files have to be in the same directory 
and the
-// file names must only differ in the extension 
(.aff/.dic).
-// Thus we use the first location only and strip the 
extension part.
-OUString aLocation = aDictIt-aLocations[0];
-sal_Int32 nPos = aLocation.lastIndexOf( '.' );
-aLocation = aLocation.copy( 0, nPos );
-aDNames[k] = aLocation;
+if ((aDictIt-aLocations[0]).endsWith(.aff))
+{
+aDAffNames[k] = aDictIt-aLocations[0];
+aDDicNames[k] = aDictIt-aLocations[1];
+}
+else
+{
+aDAffNames[k] = aDictIt-aLocations[1];
+aDDicNames[k] = aDictIt-aLocations[0];
+}
 
 ++k;
 }
@@ -225,8 +231,10 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDEncs = NULL;
 delete[] aDLocs;
 aDLocs  = NULL;
-delete[] aDNames;
-aDNames = NULL;
+delete[] aDAffNames;
+delete[] aDDicNames;
+aDAffNames = NULL;
+aDDicNames = NULL;
 aSuppLocales.realloc(0);
 }
 }
@@ -303,18 +311,16 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString 
rWord, const Locale rL
 {
 if (!aDicts[i])
 {
-OUString dicpath = aDNames[i] + .dic;
-OUString affpath = aDNames[i] + .aff;
 OUString dict;
 OUString aff;
-osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
-osl::FileBase::getSystemPathFromFileURL(affpath,aff);
+
osl::FileBase::getSystemPathFromFileURL(aDDicNames[i],dict);
+osl::FileBase::getSystemPathFromFileURL(aDAffNames[i],aff);
 OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
 OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
 
 #if defined(WNT)
-// workaround for Windows specifc problem that the
-// path length in calls to 'fopen' is limted to somewhat
+// workaround for Windows specific problem that the
+// path length in calls to 'fopen' is limited to somewhat
 // about 120+ characters which will usually be exceed when
 // using dictionaries as extensions.
 aTmpaff = Win_GetShortPathName( aff );
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 

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

[Matúš Kukan]

 scp2/source/python/file_python.scp  |2 +-
 solenv/bin/modules/installer/scriptitems.pm |   11 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a01fabf7052df9b5d3921da4916bba6c05c4d6ac
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 9 20:24:21 2013 +0100

scp2: Fix one more 'Name' path.

It is under #ifdef MINGW_SYSTEM_PYTHON, so nobody noticed.

Change-Id: Idf48079e5533ef20fd37eef819c9ac2601833a14

diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index 66e590d..fda0ba5 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -131,7 +131,7 @@ End
 // python_wrapper.exe
 File gid_File_Py_Bin_Python
 BIN_FILE_BODY;
-Name = EXENAME(pyuno/python);
+Name = EXENAME(python);
 Dir = gid_Brand_Dir_Program;
 Styles = (PACKED);
 End
commit 5015f04db460806a8247e97d9f1fe77f1501b255
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Dec 9 20:16:32 2013 +0100

fdo#72451: installer: Make filelists work again.

regression from c2f5e09900561d417d53a74fd6bc189cb7d898e1

Change-Id: I840d066ec2fccb35fdbd96939c5593a71beb0abd

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index be1123d..3310951 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -874,7 +874,16 @@ sub get_Destination_Directory_For_Item_From_Directorylist  
 # this is used f
 elsif ((!( $ispredefinedprogdir ))  (!( $ispredefinedconfigdir )))
 {
 my $directorynameref = 
get_Directoryname_From_Directorygid($dirsarrayref, $searchdirgid, $onelanguage, 
$oneitemgid);
-$destfilename = $$directorynameref . 
$installer::globals::separator . $oneitem-{'Name'};
+my $styles = ;
+if ($oneitem-{'Styles'}) { $styles = $oneitem-{'Styles'}; }
+if ($styles =~ /\bFILELIST\b/)
+{
+$destfilename = $$directorynameref . 
$installer::globals::separator . $oneitemname;
+}
+else
+{
+$destfilename = $$directorynameref . 
$installer::globals::separator . $oneitem-{'Name'};
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_MobileLibreOffice_app.mk ios/MobileLibreOffice ios/shared

[Tor Lillqvist]

 ios/CustomTarget_MobileLibreOffice_app.mk |1 +
 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |4 
 ios/shared/ios_sharedlo/cxx/mlo.mm|2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9f53053edac882a466ee69734665a1d66d52f10b
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 21:44:20 2013 +0200

Add types.rdb (formerly known as udkapi.rdb) to MobileLibreOffice

Keeping this stuff working is hard. How did I not notice this before?
I need to make clean more often I guess.

I edited the project.pbxproj file manually as I didn't fully get it
how to set up the wanted handling of this file in the Xcode GUI. So I
just copied the handling of offapi.rdb in project.pbxproj (with
different ids, of course).

I really much prefer doing this fully in Makefiles, as in
CustomTarget_LibreOffice_app.mk.

Change-Id: Ifc4f2481f7a9d1562be6f91714ed38c82cdd5eb0

diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk 
b/ios/CustomTarget_MobileLibreOffice_app.mk
index 27a029c..122b067 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -57,6 +57,7 @@ MobileLibreOffice_setup:
mkdir -p $(DEST_RESOURCE)/ure
 
# copy rdb files
+   cp $(INSTDIR)/ure/share/misc/types.rdb  $(DEST_RESOURCE)
cp $(INSTDIR)/program/types/offapi.rdb  $(DEST_RESOURCE)
cp $(INSTDIR)/program/types/oovbaapi.rdb$(DEST_RESOURCE)
cp $(INSTDIR)/program/services/services.rdb $(DEST_RESOURCE)
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj 
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index e806d6b..f34387f 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -53,6 +53,7 @@
68C6FC54180AD1B9005ACB02 /* QuartzCore.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 68C6FC53180AD1B9005ACB02 /* 
QuartzCore.framework */; };
68C6FC56180AD1FB005ACB02 /* CoreText.framework in Frameworks */ 
= {isa = PBXBuildFile; fileRef = 68C6FC55180AD1FB005ACB02 /* CoreText.framework 
*/; };
68C6FC58180AD28C005ACB02 /* MessageUI.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 68C6FC57180AD28C005ACB02 /* 
MessageUI.framework */; };
+   691D78BB180C12D300D52D5E /* types.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 691D78B0180C12D300D52D5E /* types.rdb */; };
88E9476B180DB9B600771808 /* NSObject+MLOFileUtils.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 88E9476A180DB9B600771808 /* 
NSObject+MLOFileUtils.m */; };
 /* End PBXBuildFile section */
 
@@ -125,6 +126,7 @@
68C6FC53180AD1B9005ACB02 /* QuartzCore.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; 
sourceTree = SDKROOT; };
68C6FC55180AD1FB005ACB02 /* CoreText.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
CoreText.framework; path = System/Library/Frameworks/CoreText.framework; 
sourceTree = SDKROOT; };
68C6FC57180AD28C005ACB02 /* MessageUI.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; 
sourceTree = SDKROOT; };
+   691D78B0180C12D300D52D5E /* types.rdb */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = types.rdb; path = 
resource_link/types.rdb; sourceTree = SOURCE_ROOT; };
88E94769180DB9B600771808 /* NSObject+MLOFileUtils.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
NSObject+MLOFileUtils.h; sourceTree = group; };
88E9476A180DB9B600771808 /* NSObject+MLOFileUtils.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= NSObject+MLOFileUtils.m; sourceTree = group; };
BE82BDB8182261AD00A447B5 /* pagechg.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pagechg.cxx; 
path = ../../sw/source/core/layout/pagechg.cxx; sourceTree = group; };
@@ -432,6 +434,7 @@
681D78B6180C12D300D52D5E /* share */,
681D78AF180C12D300D52D5E /* fundamentalrc */,
681D78B0180C12D300D52D5E /* offapi.rdb */,
+   691D78B0180C12D300D52D5E /* types.rdb */,
681D78B1180C12D300D52D5E /* oovbaapi.rdb */,
681D78B3180C12D300D52D5E /* rc */,
681D78B5180C12D300D52D5E /* services.rdb */,
@@ -776,6 +779,7 @@
 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source dbaccess/source include/connectivity

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y   |   44 +++-
 connectivity/source/parse/sqlnode.cxx  |   45 +++--
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 
 include/connectivity/sqlnode.hxx   |2 
 4 files changed, 52 insertions(+), 41 deletions(-)

New commits:
commit 962cdfb1370b983fbc7f463edfab1dad53b5a8e7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sat Dec 7 20:39:33 2013 +0100

fdo#72267 boolean_test is subsumed by general case foo IS [NOT] bar

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

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 8ff9b0c..6e7b973 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -222,7 +222,7 @@ using namespace connectivity;
 %type pParseNode non_join_query_term non_join_query_primary simple_table
 %type pParseNode table_value_const_list row_value_constructor 
row_value_const_list row_value_constructor_elem
 %type pParseNode qualified_join value_exp query_term join_type 
outer_join_type join_condition boolean_term
-%type pParseNode boolean_factor truth_value boolean_test boolean_primary 
named_columns_join join_spec
+%type pParseNode boolean_factor boolean_primary named_columns_join join_spec
 %type pParseNode cast_operand cast_target factor datetime_value_exp 
/*interval_value_exp*/ datetime_term datetime_factor
 %type pParseNode datetime_primary datetime_value_fct time_zone 
time_zone_specifier /*interval_term*/ interval_qualifier
 %type pParseNode start_field non_second_datetime_field end_field 
single_datetime_field extract_field datetime_field time_zone_field
@@ -1081,12 +1081,6 @@ opt_having_clause:
;
 
/* search conditions */
-truth_value:
-   SQL_TOKEN_TRUE
- | SQL_TOKEN_FALSE
- | SQL_TOKEN_UNKNOWN
- | SQL_TOKEN_NULL
- ;
 boolean_primary:
predicate
|   '(' search_condition ')'
@@ -1130,20 +1124,9 @@ parenthesized_boolean_value_expression:
$$-append(newNode(), SQL_NODE_PUNCTUATION));
}
;
-boolean_test:
-   boolean_primary
-   |   boolean_primary SQL_TOKEN_IS sql_not truth_value
-   {
-   $$ = SQL_NEW_RULE;
-   $$-append($1);
-   $$-append($2);
-   $$-append($3);
-   $$-append($4);
-   }
-   ;
 boolean_factor:
-boolean_test
-   |   SQL_TOKEN_NOT boolean_test
+   boolean_primary
+   |   SQL_TOKEN_NOT boolean_primary
{ // boolean_factor: rule 1
$$ = SQL_NEW_RULE;
$$-append($1);
@@ -1171,12 +1154,12 @@ search_condition:
}
;
 predicate:
-   comparison_predicate
+   comparison_predicate %dprec 2
|   between_predicate
|   all_or_any_predicate
|   existence_test
|   unique_test
-   |   test_for_null
+   |   test_for_null%dprec 1
|   in_predicate
|   like_predicate
;
@@ -1384,13 +1367,20 @@ opt_escape:
;
 
 null_predicate_part_2:
-   SQL_TOKEN_IS sql_not SQL_TOKEN_NULL
-   {
+ SQL_TOKEN_IS sql_not SQL_TOKEN_NULL
+ {
$$ = SQL_NEW_RULE; // test_for_null: rule 1
$$-append($1);
$$-append($2);
$$-append($3);
-   }
+ }
+   | SQL_TOKEN_IS sql_not SQL_TOKEN_UNKNOWN
+ {
+   $$ = SQL_NEW_RULE; // test_for_null: rule 1
+   $$-append($1);
+   $$-append($2);
+   $$-append($3);
+ }
;
 test_for_null:
row_value_constructor null_predicate_part_2
@@ -3959,11 +3949,11 @@ when_operand_list:
;
 when_operand:
row_value_constructor_elem
-   |   comparison_predicate_part_2
+   |   comparison_predicate_part_2%dprec 2
|   between_predicate_part_2
|   in_predicate_part_2
|   character_like_predicate_part_2
-   |   null_predicate_part_2
+   |   null_predicate_part_2  %dprec 1
 ;
 searched_when_clause_list:
searched_when_clause
diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index e818d3e..3544018 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -620,7 +620,6 @@ void 
OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer rString, const
 case unique_test:
 case all_or_any_predicate:
 case 

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

[Julien Nabet]

 filter/source/graphicfilter/icgm/class5.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 74f181d285425bf7ec2ec8a18ad9f2e075f52594
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Dec 7 19:05:47 2013 +0100

CID#736170, CID#736171, CID#736172 Out-of-Bounds read/write

Let's be sure that nMaxcolorIndex  256

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

diff --git a/filter/source/graphicfilter/icgm/class5.cxx 
b/filter/source/graphicfilter/icgm/class5.cxx
index c0319b7..eb53788 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -316,17 +316,16 @@ void CGM::ImplDoClass5()
 if ( nMaxColorIndex  255 )
 {
 mbStatus = sal_False;
+break;
 }
-else
-{
-if ( pElement-nLatestColorMaximumIndex  
nMaxColorIndex )
-pElement-nLatestColorMaximumIndex = 
nMaxColorIndex;
+if ( pElement-nLatestColorMaximumIndex  nMaxColorIndex )
+pElement-nLatestColorMaximumIndex = nMaxColorIndex;
 
-for (  nIndex = nColorStartIndex; nIndex = 
nMaxColorIndex; nIndex++ )
-{
-pElement-aLatestColorTable[ nIndex ] = 
ImplGetBitmapColor( sal_True );
-}
+for (  nIndex = nColorStartIndex; nIndex = 
nMaxColorIndex; nIndex++ )
+{
+pElement-aLatestColorTable[ nIndex ] = 
ImplGetBitmapColor( sal_True );
 }
+
 pElement-nColorMaximumIndex = 
pElement-nLatestColorMaximumIndex;
 for ( nIndex = nColorStartIndex; nIndex = nMaxColorIndex; 
nIndex++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |   14 
+-
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ee1a055f41d6767d7983472e5088ae233286827b
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 9 22:13:33 2013 +0200

Update file paths and names after c49721950cb3d897b35f08bf871239308680b18e

Change-Id: I2798800689809c8dfc3edede337f7667ff3248a1

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj 
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index f34387f..ec45536 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -264,9 +264,9 @@
BE82BE4318228BD200A447B5 /* virdev.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; 
path = ../../vcl/source/gdi/virdev.cxx; sourceTree = group; };
BE82BE4418228BD200A447B5 /* wall.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wall.cxx; path 
= ../../vcl/source/gdi/wall.cxx; sourceTree = group; };
BE82BE4718228CA600A447B5 /* impbmp.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = impbmp.hxx; path 
= ../../vcl/inc/impbmp.hxx; sourceTree = group; };
-   BE82BE4B1822D10F00A447B5 /* ctfonts.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctfonts.cxx; 
path = ../../vcl/coretext/ctfonts.cxx; sourceTree = group; };
-   BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx; 
path = ../../vcl/coretext/ctlayout.cxx; sourceTree = group; };
-   BE82BE4E1822D10F00A447B5 /* salgdi2.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi2.cxx; 
path = ../../vcl/coretext/salgdi2.cxx; sourceTree = group; };
+   BE82BE4B1822D10F00A447B5 /* ctfonts.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctfonts.cxx; 
path = ../../vcl/quartz/ctfonts.cxx; sourceTree = group; };
+   BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx; 
path = ../../vcl/quartz/ctlayout.cxx; sourceTree = group; };
+   BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx; 
path = ../../vcl/quartz/salgdi.cxx; sourceTree = group; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -484,7 +484,7 @@
BE82BDB51822617500A447B5 /* vcl */ = {
isa = PBXGroup;
children = (
-   BE82BE4A1822D0E900A447B5 /* coretext */,
+   BE82BE4A1822D0E900A447B5 /* quartz */,
BE82BDF11822626C00A447B5 /* gdi */,
BE82BDF01822625C00A447B5 /* headless */,
BE82BE4618228C6A00A447B5 /* inc */,
@@ -679,14 +679,14 @@
name = inc;
sourceTree = group;
};
-   BE82BE4A1822D0E900A447B5 /* coretext */ = {
+   BE82BE4A1822D0E900A447B5 /* quartz */ = {
isa = PBXGroup;
children = (
BE82BE4B1822D10F00A447B5 /* ctfonts.cxx */,
BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */,
-   BE82BE4E1822D10F00A447B5 /* salgdi2.cxx */,
+   BE82BE4E1822D10F00A447B5 /* salgdi.cxx */,
);
-   name = coretext;
+   name = quartz;
sourceTree = group;
};
 /* End PBXGroup section */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re:

[Philipp Weissenbacher]

Hi Amul,

To get an overview of the code base I recommend the Code Overview (
https://wiki.documentfoundation.org/Development/Code_Overview).

Michael does a very good job dissecting and introducing the vast code base
LO is.

After that you can best pick an Easy Hack, change some code and get
building.

Happy hacking!

Regards,
Philipp
Op 9 dec. 2013 10:11 schreef Amul Mehta mht.a...@gmail.com:

 Hello all ,
 I am a 2nd year Computer Science undergraduate student. The work you
 people do sounds extremely fascinating and interesting !! .
 I am very much interested in contributing code to the Libre Office
 project.
 Can someone just give me a brief overview of how to proceed ?.
 I have a basic coding knowledge of C and C++ .
 However , I am new to working on  an real world application like Libre
 Office and the open source world  and would really appreciate if someone
 could give me some help on how to start with  IRC .

  Thanks .

  Amul . Mehta

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


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

[Libreoffice-commits] core.git: dictionaries

[Andras Timar]

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

New commits:
commit 1c7c9c504cbf286743d4722445e9ae17e997c145
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 21:18:46 2013 +0100

Updated core
Project: dictionaries  efc0a1b9f3184ede1a1ebe5b2a2a8d00133aa92b

diff --git a/dictionaries b/dictionaries
index 8e87e3e..efc0a1b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8e87e3eb166047de9359e13d3472fbe4248545d1
+Subproject commit efc0a1b9f3184ede1a1ebe5b2a2a8d00133aa92b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit b2f443eb19ada4ac059342fde1c4ee9a954b8d3a
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 21:18:46 2013 +0100

Updated core
Project: dictionaries  8af34c2295b51e33b737bd119edf6c41f79a5210

diff --git a/dictionaries b/dictionaries
index c4659a9..8af34c2 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c4659a9bbbe9a35cedcf29c11631d78ec09ebd17
+Subproject commit 8af34c2295b51e33b737bd119edf6c41f79a5210
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 xmloff/source/style/xmlnumfe.cxx |2 +-
 xmloff/source/style/xmlnumfi.cxx |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f87de91cee05656808a98ab1bd65ad9509ef7df
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 9 21:04:03 2013 +0100

resolved fdo#72537 write loext:fill-character

... instead of number:fill-character but read both.

Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 8abe415..6658a3e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -503,7 +503,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool 
bLong )
 void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
 {
 FinishTextElement_Impl();
-SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, 
XML_FILL_CHARACTER,
+SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, 
XML_FILL_CHARACTER,
   sal_True, sal_False );
 rExport.Characters( OUString( nChar ) );
 }
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index c87f754..20500af 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -497,7 +497,8 @@ const SvXMLTokenMap SvXMLNumImpData::GetStyleElemTokenMap()
 {
 //  elements in a style
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
-{ XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER,   
XML_TOK_STYLE_FILL_CHARACTER   },
+{ XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
+{ XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
 { XML_NAMESPACE_NUMBER, XML_NUMBER, 
XML_TOK_STYLE_NUMBER},
 { XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,  
XML_TOK_STYLE_SCIENTIFIC_NUMBER },
 { XML_NAMESPACE_NUMBER, XML_FRACTION,   
XML_TOK_STYLE_FRACTION  },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Example in Java

[Adriam Delgado Rivero]

See: the platform I use is Linux (Kubuntu 13.10) but does not work in ubuntu 
(do not think that is relevant).
Now I use the libraries lib/ridl.jar, lib/unoil.jar, lib/juh.jar code according 
to the needs.
http://api.libreoffice.org/examples/java/Text/SWriter.java  
also I have more code that uses the method InsetString SetString and none work 
and give the same error.


- Mensaje original -
De: Stephan Bergmann sberg...@redhat.com
Para: Adriam Delgado Rivero adriv...@uci.cu
CC: libreoffice@lists.freedesktop.org
Enviados: Lunes, 9 de Diciembre 2013 12:11:13
Asunto: Re: Example in Java

On 12/09/2013 05:12 PM, Adriam Delgado Rivero wrote:
 this problem is in LIbreOffice 4.1.3.2 exactly and work perfect in 
 Libreoffice 3.6...
 this code (http://api.libreoffice.org/examples/java/Text/SWriter.java  )
 Does this code works for you in Libo4.1.3.2?

Yes, works here with LO 4.1, too.  You still haven't told your platform 
and how exactly you build and run that test, though.

Stephan

III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 
2014. Ver www.uci.cu

III Escuela Internacional de Invierno en la UCI del 17 al 28 de febrero del 
2014. Ver www.uci.cu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk extras/source include/svx svx/source

[Olivier Hallot]

 chart2/AllLangResTarget_chartcontroller.mk   |1 
 chart2/UIConfig_chart2.mk|1 
 chart2/source/controller/dialogs/Strings.src |   10 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |  164 ++---
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc |   40 -
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx |   41 -
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.src |  172 -
 chart2/source/inc/Strings.hrc|3 
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui|  331 +++
 extras/source/glade/libreoffice-catalog.xml.in   |6 
 include/svx/dlgctl3d.hxx |3 
 svx/source/dialog/dlgctl3d.cxx   |   23 
 12 files changed, 447 insertions(+), 348 deletions(-)

New commits:
commit 56e1133f724896aec3f5b5c409fb5917a3b13eb4
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Sun Dec 8 19:33:42 2013 -0200

Convert chart 3D scene illumination to .ui

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

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 5a64ac8..a3affa3 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/Strings_Scale.src \
 chart2/source/controller/dialogs/Strings.src \
 chart2/source/controller/dialogs/Strings_Statistic.src \
-chart2/source/controller/dialogs/tp_3D_SceneIllumination.src \
 chart2/source/controller/dialogs/tp_AxisLabel.src \
 chart2/source/controller/dialogs/tp_ChartType.src \
 chart2/source/controller/dialogs/tp_DataLabel.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 7bf377e..a146bf9 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/titlerotationtabpage \
chart2/uiconfig/ui/tp_3D_SceneAppearance \
chart2/uiconfig/ui/tp_3D_SceneGeometry \
+   chart2/uiconfig/ui/tp_3D_SceneIllumination \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
chart2/uiconfig/ui/tp_LegendPosition \
diff --git a/chart2/source/controller/dialogs/Strings.src 
b/chart2/source/controller/dialogs/Strings.src
index 1aae59a..6cea901 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -384,16 +384,6 @@ String STR_TIP_SELECT_RANGE
 Text [ en-US ] = Select data range ;
 };
 
-String STR_TIP_CHOOSECOLOR
-{
-Text [ en-US ] = Select a color using the color dialog ;
-};
-
-String STR_TIP_LIGHTSOURCE_X
-{
-Text [ en-US ] = Light Source %LIGHTNUMBER ;
-};
-
 String STR_TIP_DATASERIES
 {
 Text [ en-US ] = Data Series '%SERIESNAME' ;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx 
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 031c593..8fac022 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -18,9 +18,7 @@
  */
 
 #include tp_3D_SceneIllumination.hxx
-#include tp_3D_SceneIllumination.hrc
 #include ResId.hxx
-#include Strings.hrc
 #include Bitmaps.hrc
 #include CommonConverters.hxx
 
@@ -44,21 +42,16 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-LightButton::LightButton( Window* pParent, const ResId rResId, sal_Int32 
nLightNumber )
-: ImageButton( pParent, rResId )
+LightButton::LightButton( Window* pParent)
+: ImageButton( pParent)
 , m_bLightOn(false)
 {
 SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ) );
+}
 
-OUString aTipHelpStr( SCH_RESSTR(STR_TIP_LIGHTSOURCE_X) );
-const OUString aReplacementStr( %LIGHTNUMBER );
-sal_Int32 nIndex = aTipHelpStr.indexOf( aReplacementStr );
-if( nIndex != -1 )
-{
-aTipHelpStr = aTipHelpStr.replaceAt(nIndex, 
aReplacementStr.getLength(),
-OUString::number( nLightNumber ) );
-}
-this-SetQuickHelpText( aTipHelpStr );
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLightButton(Window 
*pParent, VclBuilder::stringmap )
+{
+return new LightButton(pParent);
 }
 
 LightButton::~LightButton()
@@ -85,17 +78,6 @@ bool LightButton::isLightOn() const
 return m_bLightOn;
 }
 
-ColorButton::ColorButton( Window* pParent, const ResId rResId )
-: ImageButton( pParent, rResId )
-{
-SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) );
-

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

[Eike Rathke]

 xmloff/source/style/xmlnumfe.cxx |2 +-
 xmloff/source/style/xmlnumfi.cxx |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e06569ab7f137e0c5173bd70231c856cb67badac
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 9 21:04:03 2013 +0100

resolved fdo#72537 write loext:fill-character

... instead of number:fill-character but read both.

Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3
(cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df)

diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 8abe415..6658a3e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -503,7 +503,7 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool 
bLong )
 void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
 {
 FinishTextElement_Impl();
-SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, 
XML_FILL_CHARACTER,
+SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, 
XML_FILL_CHARACTER,
   sal_True, sal_False );
 rExport.Characters( OUString( nChar ) );
 }
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index c87f754..20500af 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -497,7 +497,8 @@ const SvXMLTokenMap SvXMLNumImpData::GetStyleElemTokenMap()
 {
 //  elements in a style
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
-{ XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER,   
XML_TOK_STYLE_FILL_CHARACTER   },
+{ XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
+{ XML_NAMESPACE_NUMBER, XML_FILL_CHARACTER, 
XML_TOK_STYLE_FILL_CHARACTER},
 { XML_NAMESPACE_NUMBER, XML_NUMBER, 
XML_TOK_STYLE_NUMBER},
 { XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,  
XML_TOK_STYLE_SCIENTIFIC_NUMBER },
 { XML_NAMESPACE_NUMBER, XML_FRACTION,   
XML_TOK_STYLE_FRACTION  },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst   |   13 -
 source/text/schart/01/three_d_view.xhp |   25 +
 2 files changed, 13 insertions(+), 25 deletions(-)

New commits:
commit 63d213bbd4e500d4bae0e36208c439ab2f346846
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 20:39:33 2013 +

update help ids for scene illumination tabpage .ui conversion

Change-Id: Ie9623181a96048040644d72e2c134b3ed6e6f883

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 4ca69ec..31bdf29 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5635,21 +5635,9 @@ chart2_Edit_TP_DATA_SOURCE_EDT_CATEGORIES,551848056,
 chart2_Edit_TP_DATA_SOURCE_EDT_RANGE,551848016,
 chart2_Edit_TP_RANGECHOOSER_ED_RANGE,551798785,
 chart2_FL_GRIDS_TP_WIZARD_TITLEANDOBJECTS,551813120,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_AMBIENT_COLOR,551906817,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHTSOURCE_COLOR,551906818,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_1,551906819,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_2,551906820,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_3,551906821,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_4,551906822,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_5,551906823,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_6,551906824,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_7,551906825,
-chart2_ImageButton_TP_3D_SCENEILLUMINATION_BTN_LIGHT_8,551906826,
 chart2_ImageButton_TP_DATA_SOURCE_IMB_RANGE_CAT,551857794,
 chart2_ImageButton_TP_DATA_SOURCE_IMB_RANGE_MAIN,551857754,
 chart2_ImageButton_TP_RANGECHOOSER_IB_RANGE,551808513,
-chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_AMBIENTLIGHT,551898625,
-chart2_ListBox_TP_3D_SCENEILLUMINATION_LB_LIGHTSOURCE,551898626,
 chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937,
 chart2_ListBox_TP_LOCATION_LB_TABLE,551833089,
 chart2_ModalDialog_DLG_DATA_YERRORBAR,1087537152,
@@ -5664,7 +5652,6 @@ 
chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867,
 chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868,
 chart2_RadioButton_TP_RANGECHOOSER_RB_DATACOLS,551797250,
 chart2_RadioButton_TP_RANGECHOOSER_RB_DATAROWS,551797249,
-chart2_TabPage_TP_3D_SCENEILLUMINATION,551895040,
 chart2_TabPage_TP_DATA_SOURCE,551845888,
 chart2_TabPage_TP_LAYOUT,551731200,
 chart2_TabPage_TP_LOCATION,551829504,
diff --git a/source/text/schart/01/three_d_view.xhp 
b/source/text/schart/01/three_d_view.xhp
index f19358d..ce510ef 100644
--- a/source/text/schart/01/three_d_view.xhp
+++ b/source/text/schart/01/three_d_view.xhp
@@ -108,6 +108,7 @@
 paragraph xml-lang=en-US id=par_id946684 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenShows borders around the areas by 
setting the line style to Solid./ahelp/paragraphcommentRounded 
Edges/comment
 bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_3D_SceneAppearance/CB_ROUNDEDEDGE 
id=bm_id4585100 localize=false/
 paragraph xml-lang=en-US id=par_id9607226 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenEdges are rounded by 
5%./ahelp/paragraph
+  bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_3D_SceneIllumination/tp_3D_SceneIllumination 
id=bm_id476392 localize=false/
   paragraph xml-lang=en-US id=hd_id1939451 role=heading level=2 
l10n=NEWIllumination/paragraph
   paragraph xml-lang=en-US id=par_id9038972 role=paragraph 
l10n=NEWSet the light sources for the 3D view./paragraph
   list type=unordered
@@ -137,23 +138,23 @@
 !-- removed HID 34146 33795 --
 
 paragraph xml-lang=en-US id=par_id6394238 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenClick to switch between an 
illumination model of a sphere or a cube./ahelp/paragraphcommentLight 
source/comment
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1 
id=bm_id2334665 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_3D_SceneIllumination/BTN_LIGHT_1 
id=bm_id2334665 localize=false/
 paragraph xml-lang=en-US id=par_id533768 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenClick to enable or disable the 
specular light source with highlights./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2 
id=bm_id476393 localize=false/
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3 
id=bm_id2655720 localize=false/
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4 
id=bm_id3682058 localize=false/
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5 
id=bm_id5977965 localize=false/
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6 
id=bm_id3050325 localize=false/
-bookmark xml-lang=en-US 
branch=hid/chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7 
id=bm_id9421979 localize=false/
-bookmark xml-lang=en-US 

[Libreoffice-commits] core.git: 3 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk helpcontent2

[Caolán McNamara]

 chart2/AllLangResTarget_chartcontroller.mk   |1 
 chart2/UIConfig_chart2.mk|1 
 chart2/source/controller/dialogs/ResourceIds.hrc |1 
 chart2/source/controller/dialogs/dlg_View3D.cxx  |   31 -
 chart2/source/controller/dialogs/dlg_View3D.hrc  |   34 -
 chart2/source/controller/dialogs/dlg_View3D.src  |   41 --
 chart2/source/controller/inc/HelpIds.hrc |1 
 chart2/source/controller/inc/dlg_View3D.hxx  |7 
 chart2/uiconfig/ui/3dviewdialog.ui   |   91 
 chart2/uiconfig/ui/inserttitledlg.ui |1 
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui|  467 +--
 helpcontent2 |2 
 12 files changed, 373 insertions(+), 305 deletions(-)

New commits:
commit 592719cda0fc1f0ab0f249b321d1a3b16fbcbbbe
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 20:31:15 2013 +

missing title text

Change-Id: Ic3e2791c752aee5a5ec081f4a544e0a45f3ea0e1

diff --git a/chart2/uiconfig/ui/inserttitledlg.ui 
b/chart2/uiconfig/ui/inserttitledlg.ui
index 407cd62..d3938e8 100644
--- a/chart2/uiconfig/ui/inserttitledlg.ui
+++ b/chart2/uiconfig/ui/inserttitledlg.ui
@@ -4,6 +4,7 @@
   object class=GtkDialog id=InsertTitleDialog
 property name=can_focusFalse/property
 property name=border_width6/property
+property name=title translatable=yesTitles/property
 property name=type_hintdialog/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
commit e3a5fec0ead2d0ac5319265c19b4988cf241d81d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 9 20:23:16 2013 +

convert 3dview dialog to .ui

Change-Id: I790d8cccedeac70f5430cfb75e03914472b9c3d6

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index a3affa3..9342cc7 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/dlg_InsertLegend.src \
 chart2/source/controller/dialogs/dlg_ShapeFont.src \
 chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
-chart2/source/controller/dialogs/dlg_View3D.src \
 chart2/source/controller/dialogs/res_BarGeometry.src \
 chart2/source/controller/dialogs/res_TextSeparator.src \
 chart2/source/controller/dialogs/Strings_AdditionalControls.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index a146bf9..41a5fa9 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
+   chart2/uiconfig/ui/3dviewdialog \
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc 
b/chart2/source/controller/dialogs/ResourceIds.hrc
index fa61cce..10effe1 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -30,7 +30,6 @@
 #define DLG_DATA_SOURCE 901
 #define DLG_DATA_DESCR  836
 #define DLG_LEGEND  835
-#define DLG_3D_VIEW 752
 #define DLG_SPLINE_PROPERTIES 904
 #define DLG_DATA_YERRORBAR  842
 #define DLG_SHAPE_FONT  921
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx 
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 7eda837..61f3826 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -18,7 +18,6 @@
  */
 
 #include dlg_View3D.hxx
-#include dlg_View3D.hrc
 #include Strings.hrc
 #include TabPages.hrc
 #include ResId.hxx
@@ -42,32 +41,28 @@ using namespace ::com::sun::star::chart2;
 sal_uInt16 View3DDialog::m_nLastPageId = 0;
 
 View3DDialog::View3DDialog(Window* pParent, const uno::Reference 
frame::XModel   xChartModel, const XColorListRef pColorTable )
-: TabDialog(pParent,SchResId(DLG_3D_VIEW))
-, m_aTabControl(this,SchResId(TABCTRL))
-, m_aBtnOK(this,SchResId(BTN_OK))
-, m_aBtnCancel(this,SchResId(BTN_CANCEL))
-, m_aBtnHelp(this,SchResId(BTN_HELP))
+: TabDialog(pParent, 3DViewDialog, modules/schart/ui/3dviewdialog.ui)
 , m_pGeometry(0)
 , m_pAppearance(0)
 , m_pIllumination(0)
 , m_aControllerLocker(xChartModel)
 {
-FreeResource();
+get(m_pTabControl, tabcontrol);
 
 uno::Reference beans::XPropertySet  xSceneProperties( 
ChartModelHelper::findDiagram( xChartModel ), uno::UNO_QUERY );
-m_pGeometry   = new 
ThreeD_SceneGeometry_TabPage(m_aTabControl,xSceneProperties,m_aControllerLocker);
-m_pAppearance = new 
ThreeD_SceneAppearance_TabPage(m_aTabControl,xChartModel,m_aControllerLocker);
-m_pIllumination = new 

[Libreoffice-commits] core.git: 4 commits - writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source

[Miklos Vajna]

 writerfilter/Library_writerfilter.mk|1 
 writerfilter/inc/doctok/WW8Document.hxx |  191 -
 writerfilter/source/doctok/WW8ResourceModelImpl.cxx |  401 
 writerfilter/source/doctok/WW8ResourceModelImpl.hxx |  308 ---
 writerfilter/source/doctok/resourceidmapper.xsl |  116 -
 writerfilter/source/doctok/resourceidmapperback.xsl |  115 -
 writerfilter/source/doctok/resources.xsl|1 
 writerfilter/source/doctok/xmistat.xsl  |   28 -
 8 files changed, 1161 deletions(-)

New commits:
commit 22115840c28508819f16532d8db7fa569dd7891c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Dec 9 21:45:35 2013 +0100

writerfilter: remove unused resourceidmapper

Change-Id: I70299737ce00a43202aafc5451e6b275feda1caf

diff --git a/writerfilter/source/doctok/resourceidmapper.xsl 
b/writerfilter/source/doctok/resourceidmapper.xsl
deleted file mode 100644
index c860bfb..000
--- a/writerfilter/source/doctok/resourceidmapper.xsl
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=u
 rn:oasis:names:tc:opendocument:xmlns:script:1.0 
xmlns:config=urn:oasis:names:tc:opendocument:xmlns:config:1.0 
xmlns:ooo=http://openoffice.org/2004/office; 
xmlns:ooow=http://openoffice.org/2004/writer; 
xmlns:oooc=http://openoffice.org/2004/calc; 
xmlns:dom=http://www.w3.org/2001/xml-events; 
xmlns:xforms=http://www.w3.org/2002/xforms; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;  
-xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#; xmlns:UML = 
'org.omg.xmi.namespace.UML' xml:space=default
-  xsl:output method=text /
-
-  !-- Key all attributes with the same name and same value --
-  xsl:key name=same-valued-tagged-data
-   match=UML:TaggedValue.dataValue use=. /
-
-  xsl:template match=/
-out
-  xsl:text
-/*
-
-   THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT!
-   
-*/
-
-package analyze;
-
-import java.util.LinkedHashMap;
-
-/**
- *
- * @author hb137859
- */
-public class ResourceIdMap extends LinkedHashMap lt;String, Integer gt; {
-
-static ResourceIdMap mInstance = new ResourceIdMap();
-
-/** Creates a new instance of ResourceIdMap */
-protected ResourceIdMap() {
-/* Attributes */#xa;/xsl:text
-  xsl:for-each 
select='.//UML:Attribute[@name!=reserved][count(.//UML:Stereotype[@xmi.idref=noqname])
 = 0]//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref=attrid]'
-xsl:choose
-  xsl:when test='generate-id(UML:TaggedValue.dataValue) != 
generate-id(key(same-valued-tagged-data, UML:TaggedValue.dataValue)[1])'/
-  !-- xsl:when test='.//UML:TaggedValue.dataValue = 
preceding::*//UML:TaggedValue.dataValue'/--
-  xsl:otherwise
-xsl:textput(/xsl:text
-xsl:call-template name='idtoqname'
-  xsl:with-param name='id'xsl:value-of 
select='.//UML:TaggedValue.dataValue'//xsl:with-param
-/xsl:call-template
-xsl:text, /xsl:text
-xsl:value-of select='1 + position()'/
-xsl:text);#xa;/xsl:text
-  

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

[Andras Timar]

 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   42 ---
 lingucomponent/source/spellcheck/spell/sspellimp.hxx |3 -
 2 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 5a59bb25069d587b28c1d39e33b01accffc0de66
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:34:28 2013 +0100

Revert fdo#56443 allow different name for .dic and .aff files

This reverts commit 37f7a6b6c529140c827a875be7ad483a08e16631.

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index bce00cc..e3a79df 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -66,8 +66,7 @@ SpellChecker::SpellChecker() :
 aDicts(NULL),
 aDEncs(NULL),
 aDLocs(NULL),
-aDAffNames(NULL),
-aDDicNames(NULL),
+aDNames(NULL),
 numdict(0),
 aEvtListeners(GetLinguMutex()),
 pPropHelper(NULL),
@@ -87,8 +86,7 @@ SpellChecker::~SpellChecker()
 }
 delete[] aDEncs;
 delete[] aDLocs;
-delete[] aDAffNames;
-delete[] aDDicNames;
+delete[] aDNames;
 if (pPropHelper)
 {
 pPropHelper-RemoveAsPropListener();
@@ -185,8 +183,7 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts  = new Hunspell* [numdict];
 aDEncs  = new rtl_TextEncoding [numdict];
 aDLocs  = new Locale [numdict];
-aDAffNames = new OUString [numdict];
-aDDicNames = new OUString [numdict];
+aDNames = new OUString [numdict];
 k = 0;
 for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
 {
@@ -204,16 +201,13 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDicts[k]  = NULL;
 aDEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
 aDLocs[k]  = LanguageTag::convertToLocale( 
aLocaleNames[i] );
-if ((aDictIt-aLocations[0]).endsWith(.aff))
-{
-aDAffNames[k] = aDictIt-aLocations[0];
-aDDicNames[k] = aDictIt-aLocations[1];
-}
-else
-{
-aDAffNames[k] = aDictIt-aLocations[1];
-aDDicNames[k] = aDictIt-aLocations[0];
-}
+// also both files have to be in the same directory 
and the
+// file names must only differ in the extension 
(.aff/.dic).
+// Thus we use the first location only and strip the 
extension part.
+OUString aLocation = aDictIt-aLocations[0];
+sal_Int32 nPos = aLocation.lastIndexOf( '.' );
+aLocation = aLocation.copy( 0, nPos );
+aDNames[k] = aLocation;
 
 ++k;
 }
@@ -231,10 +225,8 @@ Sequence Locale  SAL_CALL SpellChecker::getLocales()
 aDEncs = NULL;
 delete[] aDLocs;
 aDLocs  = NULL;
-delete[] aDAffNames;
-delete[] aDDicNames;
-aDAffNames = NULL;
-aDDicNames = NULL;
+delete[] aDNames;
+aDNames = NULL;
 aSuppLocales.realloc(0);
 }
 }
@@ -311,16 +303,18 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString 
rWord, const Locale rL
 {
 if (!aDicts[i])
 {
+OUString dicpath = aDNames[i] + .dic;
+OUString affpath = aDNames[i] + .aff;
 OUString dict;
 OUString aff;
-
osl::FileBase::getSystemPathFromFileURL(aDDicNames[i],dict);
-osl::FileBase::getSystemPathFromFileURL(aDAffNames[i],aff);
+osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
+osl::FileBase::getSystemPathFromFileURL(affpath,aff);
 OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
 OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
 
 #if defined(WNT)
-// workaround for Windows specific problem that the
-// path length in calls to 'fopen' is limited to somewhat
+// workaround for Windows specifc problem that the
+// path length in calls to 'fopen' is limted to somewhat
 // about 120+ characters which will usually be exceed when
 // using dictionaries as extensions.
 aTmpaff = Win_GetShortPathName( aff );
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 47c1c31..89ac20e 100644
--- 

[Libreoffice-commits] core.git: dictionaries

[Andras Timar]

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

New commits:
commit 6c4f8bbadd9c3196725600f9cddb2b151622caa6
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:42:34 2013 +0100

Updated core
Project: dictionaries  bdd76ca138ded701c4436ca09d6961009bc1114b

diff --git a/dictionaries b/dictionaries
index efc0a1b..bdd76ca 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit efc0a1b9f3184ede1a1ebe5b2a2a8d00133aa92b
+Subproject commit bdd76ca138ded701c4436ca09d6961009bc1114b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: de/de_AT_frami.aff de/de_CH_frami.aff de/dictionaries.xcu de/README_extension_owner.txt Dictionary_de.mk

[Andras Timar]

 Dictionary_de.mk|2 
 de/de_AT_frami.aff  |  717 
 de/de_CH_frami.aff  |  717 
 de/dictionaries.xcu |6 
 4 files changed, 1438 insertions(+), 4 deletions(-)

New commits:
commit bdd76ca138ded701c4436ca09d6961009bc1114b
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:42:34 2013 +0100

fdo#56443 .dic and .aff name must be the same

Change-Id: I4fc7d51c25ac312995e203dba1a0dc41a39bb45a

diff --git a/Dictionary_de.mk b/Dictionary_de.mk
index 0b7c8d9..ca02e5d 100644
--- a/Dictionary_de.mk
+++ b/Dictionary_de.mk
@@ -13,7 +13,9 @@ $(eval $(call gb_Dictionary_add_root_files,dict-de,\
dictionaries/de/COPYING_GPLv2 \
dictionaries/de/COPYING_GPLv3 \
dictionaries/de/COPYING_OASIS.txt \
+   dictionaries/de/de_AT_frami.aff \
dictionaries/de/de_AT_frami.dic \
+   dictionaries/de/de_CH_frami.aff \
dictionaries/de/de_CH_frami.dic \
dictionaries/de/de_DE_frami.aff \
dictionaries/de/de_DE_frami.dic \
diff --git a/de/README_extension_owner.txt b/de/README_extension_owner.txt
old mode 100755
new mode 100644
diff --git a/de/de_AT_frami.aff b/de/de_AT_frami.aff
new file mode 100644
index 000..137e86b
--- /dev/null
+++ b/de/de_AT_frami.aff
@@ -0,0 +1,717 @@
+# this is the affix file of the de_AT Hunspell dictionary
+# derived from the igerman98 dictionary
+#
+# Version: 20131206+frami20131206 (build 20131206)
+#
+# Copyright (C) 1998-2013 Bjoern Jacke bjo...@j3e.de
+#
+# License: GPLv2, GPLv3 or OASIS distribution license agreement
+# There should be a copy of both of this licenses included
+# with every distribution of this dictionary. Modified
+# versions using the GPL may only include the GPL
+
+SET ISO8859-1
+TRY esijanrtolcdugmphbyfvkwqxzäüößáéêàâñESIJANRTOLCDUGMPHBYFVKWQXZÄÜÖÉ-.
+
+PFX U Y 1
+PFX U   0 un   .
+
+PFX V Y 1
+PFX V   0 ver  .
+
+SFX F Y 35
+SFX F   0 nenin
+SFX F   e in e
+SFX F   e innen  e
+SFX F   0 in [^i]n
+SFX F   0 innen  [^i]n
+SFX F   0 in [^enr]
+SFX F   0 innen  [^enr]
+SFX F   0 in [^e]r
+SFX F   0 innen  [^e]r
+SFX F   0 in [^r]er
+SFX F   0 innen  [^r]er
+SFX F   0 in [^e]rer
+SFX F   0 innen  [^e]rer
+SFX F   0 in ierer
+SFX F   0 innen  ierer
+SFX F   erin [^i]erer
+SFX F   erinnen  [^i]erer
+SFX F   inIn in
+SFX F   inInnen  in
+SFX F   e In e
+SFX F   e Innen  e
+SFX F   0 In [^i]n
+SFX F   0 Innen  [^i]n
+SFX F   0 In [^en]
+SFX F   0 Innen  [^en]
+SFX F   0 In [^e]r
+SFX F   0 Innen  [^e]r
+SFX F   0 In [^r]er
+SFX F   0 Innen  [^r]er
+SFX F   0 In [^e]rer
+SFX F   0 Innen  [^e]rer
+SFX F   0 In ierer
+SFX F   0 Innen  ierer
+SFX F   erIn [^i]erer
+SFX F   erInnen  [^i]erer
+#SFX F   eninnenen
+#SFX F   enInnenen
+
+
+SFX L N 12
+SFX L   0   tlich  n
+SFX L   0   tliche n
+SFX L   0   tlichern
+SFX L   0   tlichesn
+SFX L   0   tlichemn
+SFX L   0   tlichenn
+SFX L   0   lich   [^n]
+SFX L   0   liche  [^n]
+SFX L   0   licher [^n]
+SFX L   0   liches [^n]
+SFX L   0   lichem [^n]
+SFX L   0   lichen [^n]
+
+
+#SFX H N 2
+#SFX H   0   heit   .
+#SFX H   0   heiten .
+
+
+#SFX K N 2
+#SFX K   0   keit   .
+#SFX K   0   keiten .
+
+
+SFX M N 10
+SFX M   0   chen   [^se]
+SFX M   0   chens  [^se]
+SFX M   ass ässchenass
+SFX M   ass ässchens   ass
+SFX M   oss össchenoss
+SFX M   oss össchens   oss
+SFX M   uss üsschenuss
+SFX M   uss üsschens   uss
+SFX M   e   chen   e
+SFX M   e   chens  e
+
+
+SFX A Y 46
+SFX A   0   r  e
+SFX A   0   n  e
+SFX A   0   m  e
+SFX A   0   s  e
+SFX A   0   e  [^elr]
+SFX A   0   er [^elr]
+SFX A   0   en [^elr]
+SFX A   0   em [^elr]
+SFX A   0   es [^elr]
+SFX A   0   e  [^e][rl]
+SFX A   0   er [^e][rl]
+SFX A   0   en [^e][rl]
+SFX A   0   em [^e][rl]
+SFX A   0   es [^e][rl]
+SFX A   0   e  [^u]er
+SFX A   0   er [^u]er
+SFX A   0   en [^u]er
+SFX A   0   em [^u]er
+SFX A   0   es [^u]er
+SFX A   er  re uer
+SFX A   er  reruer
+SFX A   er  renuer
+SFX A   er  remuer
+SFX A   er  resuer
+SFX A   0   e  [eil]el
+SFX A   0   er [eil]el
+SFX A   0   en

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

[Andras Timar]

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

New commits:
commit 9b2ffa4989531b8681488cf58ddfc935807e58ce
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:42:34 2013 +0100

Updated core
Project: dictionaries  7ac7087863c1940937b3dd9616a22a61e28f24f6

diff --git a/dictionaries b/dictionaries
index 8af34c2..7ac7087 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8af34c2295b51e33b737bd119edf6c41f79a5210
+Subproject commit 7ac7087863c1940937b3dd9616a22a61e28f24f6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-2' - de/de_AT_frami.aff de/de_CH_frami.aff de/dictionaries.xcu de/README_extension_owner.txt Dictionary_de.mk

[Andras Timar]

 Dictionary_de.mk|2 
 de/de_AT_frami.aff  |  717 
 de/de_CH_frami.aff  |  717 
 de/dictionaries.xcu |6 
 4 files changed, 1438 insertions(+), 4 deletions(-)

New commits:
commit 7ac7087863c1940937b3dd9616a22a61e28f24f6
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:42:34 2013 +0100

fdo#56443 .dic and .aff name must be the same

Change-Id: I4fc7d51c25ac312995e203dba1a0dc41a39bb45a

diff --git a/Dictionary_de.mk b/Dictionary_de.mk
index 0b7c8d9..ca02e5d 100644
--- a/Dictionary_de.mk
+++ b/Dictionary_de.mk
@@ -13,7 +13,9 @@ $(eval $(call gb_Dictionary_add_root_files,dict-de,\
dictionaries/de/COPYING_GPLv2 \
dictionaries/de/COPYING_GPLv3 \
dictionaries/de/COPYING_OASIS.txt \
+   dictionaries/de/de_AT_frami.aff \
dictionaries/de/de_AT_frami.dic \
+   dictionaries/de/de_CH_frami.aff \
dictionaries/de/de_CH_frami.dic \
dictionaries/de/de_DE_frami.aff \
dictionaries/de/de_DE_frami.dic \
diff --git a/de/README_extension_owner.txt b/de/README_extension_owner.txt
old mode 100755
new mode 100644
diff --git a/de/de_AT_frami.aff b/de/de_AT_frami.aff
new file mode 100644
index 000..137e86b
--- /dev/null
+++ b/de/de_AT_frami.aff
@@ -0,0 +1,717 @@
+# this is the affix file of the de_AT Hunspell dictionary
+# derived from the igerman98 dictionary
+#
+# Version: 20131206+frami20131206 (build 20131206)
+#
+# Copyright (C) 1998-2013 Bjoern Jacke bjo...@j3e.de
+#
+# License: GPLv2, GPLv3 or OASIS distribution license agreement
+# There should be a copy of both of this licenses included
+# with every distribution of this dictionary. Modified
+# versions using the GPL may only include the GPL
+
+SET ISO8859-1
+TRY esijanrtolcdugmphbyfvkwqxzäüößáéêàâñESIJANRTOLCDUGMPHBYFVKWQXZÄÜÖÉ-.
+
+PFX U Y 1
+PFX U   0 un   .
+
+PFX V Y 1
+PFX V   0 ver  .
+
+SFX F Y 35
+SFX F   0 nenin
+SFX F   e in e
+SFX F   e innen  e
+SFX F   0 in [^i]n
+SFX F   0 innen  [^i]n
+SFX F   0 in [^enr]
+SFX F   0 innen  [^enr]
+SFX F   0 in [^e]r
+SFX F   0 innen  [^e]r
+SFX F   0 in [^r]er
+SFX F   0 innen  [^r]er
+SFX F   0 in [^e]rer
+SFX F   0 innen  [^e]rer
+SFX F   0 in ierer
+SFX F   0 innen  ierer
+SFX F   erin [^i]erer
+SFX F   erinnen  [^i]erer
+SFX F   inIn in
+SFX F   inInnen  in
+SFX F   e In e
+SFX F   e Innen  e
+SFX F   0 In [^i]n
+SFX F   0 Innen  [^i]n
+SFX F   0 In [^en]
+SFX F   0 Innen  [^en]
+SFX F   0 In [^e]r
+SFX F   0 Innen  [^e]r
+SFX F   0 In [^r]er
+SFX F   0 Innen  [^r]er
+SFX F   0 In [^e]rer
+SFX F   0 Innen  [^e]rer
+SFX F   0 In ierer
+SFX F   0 Innen  ierer
+SFX F   erIn [^i]erer
+SFX F   erInnen  [^i]erer
+#SFX F   eninnenen
+#SFX F   enInnenen
+
+
+SFX L N 12
+SFX L   0   tlich  n
+SFX L   0   tliche n
+SFX L   0   tlichern
+SFX L   0   tlichesn
+SFX L   0   tlichemn
+SFX L   0   tlichenn
+SFX L   0   lich   [^n]
+SFX L   0   liche  [^n]
+SFX L   0   licher [^n]
+SFX L   0   liches [^n]
+SFX L   0   lichem [^n]
+SFX L   0   lichen [^n]
+
+
+#SFX H N 2
+#SFX H   0   heit   .
+#SFX H   0   heiten .
+
+
+#SFX K N 2
+#SFX K   0   keit   .
+#SFX K   0   keiten .
+
+
+SFX M N 10
+SFX M   0   chen   [^se]
+SFX M   0   chens  [^se]
+SFX M   ass ässchenass
+SFX M   ass ässchens   ass
+SFX M   oss össchenoss
+SFX M   oss össchens   oss
+SFX M   uss üsschenuss
+SFX M   uss üsschens   uss
+SFX M   e   chen   e
+SFX M   e   chens  e
+
+
+SFX A Y 46
+SFX A   0   r  e
+SFX A   0   n  e
+SFX A   0   m  e
+SFX A   0   s  e
+SFX A   0   e  [^elr]
+SFX A   0   er [^elr]
+SFX A   0   en [^elr]
+SFX A   0   em [^elr]
+SFX A   0   es [^elr]
+SFX A   0   e  [^e][rl]
+SFX A   0   er [^e][rl]
+SFX A   0   en [^e][rl]
+SFX A   0   em [^e][rl]
+SFX A   0   es [^e][rl]
+SFX A   0   e  [^u]er
+SFX A   0   er [^u]er
+SFX A   0   en [^u]er
+SFX A   0   em [^u]er
+SFX A   0   es [^u]er
+SFX A   er  re uer
+SFX A   er  reruer
+SFX A   er  renuer
+SFX A   er  remuer
+SFX A   er  resuer
+SFX A   0   e  [eil]el
+SFX A   0   er [eil]el
+SFX A   0   en

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - dictionaries

[Andras Timar]

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

New commits:
commit 67b412ee3096c0c9264927c6ae9932875ebdea72
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Dec 9 22:42:34 2013 +0100

Updated core
Project: dictionaries  c89feb36ab8a4770881e29635aa60ab2717f28a6

diff --git a/dictionaries b/dictionaries
index ddce99b..c89feb3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit ddce99b119fa7c565f0f6d783b2b136434ba9418
+Subproject commit c89feb36ab8a4770881e29635aa60ab2717f28a6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re:

[Norbert Thiebaud]

On Mon, Dec 9, 2013 at 3:11 AM, Amul Mehta mht.a...@gmail.com wrote:
 Hello all ,
 I am a 2nd year Computer Science undergraduate student. The work you people
 do sounds extremely fascinating and interesting !! .
 I am very much interested in contributing code to the Libre Office project.
 Can someone just give me a brief overview of how to proceed ?.

First thing first https://wiki.documentfoundation.org/Development
take a look there follow some links...

The very first thing you want to achieve is to build the product yourself.

Then as indicated in other posts take a look at the EasyHacks to find
some task that seems suitable to you...
You can also try the route of browsing our bugzilla and find bugs that
you feel like trying to fix... I suspect that may be a bit harder at
first, but that can be quite rewarding too :-)

Make sure you familiarized yourself with gerrit (
http://gerrit.libreoffice.org ) as this is the preferred way to submit
patches...
https://gerrit.libreoffice.org/Documentation/intro-quick.html give a
nice overview of gerrit and how to use it.

If you are not familiar with git, you may also want to google for some
introduction to it.. there are plenty of
resource/manual/video/presentation etc.. on gerrit. you are bound to
find one that explains it in a way that is clear to you :-)

Welcome to LibreOffice and Have fun :-)

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

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

[Tomaž Vajngerl]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   28 +
 chart2/source/controller/dialogs/Strings_Statistic.src  |   14 +-
 chart2/source/inc/RegressionCurveHelper.hxx |   19 +++
 chart2/source/tools/RegressionCurveHelper.cxx   |   78 +---
 4 files changed, 118 insertions(+), 21 deletions(-)

New commits:
commit b0e66c05aff05843e6ca76aebc851671cb1d05ef
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Dec 9 23:01:48 2013 +0100

More clearly name the trendline in chart's element selection box.

Change-Id: I5f787eb064524a3b2399d591866a5b8cbdee6294

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 648a6c7..73d8416 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -747,8 +747,8 @@ OUString ObjectNameProvider::getNameForCID(
 case OBJECTTYPE_DATA_ERRORS_X:
 case OBJECTTYPE_DATA_ERRORS_Y:
 case OBJECTTYPE_DATA_ERRORS_Z:
-case OBJECTTYPE_DATA_CURVE:
 case OBJECTTYPE_DATA_AVERAGE_LINE:
+case OBJECTTYPE_DATA_CURVE:
 case OBJECTTYPE_DATA_CURVE_EQUATION:
 {
 OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel );
@@ -766,8 +766,30 @@ OUString ObjectNameProvider::getNameForCID(
 aRet += getName( OBJECTTYPE_DATA_LABEL  );
 }
 }
+else if (eType == OBJECTTYPE_DATA_CURVE || eType == 
OBJECTTYPE_DATA_CURVE_EQUATION)
+{
+Reference chart2::XDataSeries  xSeries( 
ObjectIdentifier::getDataSeriesForCID( rObjectCID , xModel ));
+Reference chart2::XRegressionCurveContainer  xCurveCnt( 
xSeries, uno::UNO_QUERY );
+
+aRet +=  ;
+aRet += getName(eType);
+
+if( xCurveCnt.is())
+{
+sal_Int32 nCurveIndex = 
ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
+Reference chart2::XRegressionCurve  xCurve( 
RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
+if( xCurve.is())
+{
+aRet +=  (;
+aRet += 
RegressionCurveHelper::getRegressionCurveName(xCurve);
+aRet += );
+}
+}
+}
 else
+{
 aRet += getName( eType );
+}
 return aRet;
 }
 default:
diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src 
b/chart2/source/controller/dialogs/Strings_Statistic.src
index 7469f66..0be3a37 100644
--- a/chart2/source/controller/dialogs/Strings_Statistic.src
+++ b/chart2/source/controller/dialogs/Strings_Statistic.src
@@ -43,32 +43,32 @@ String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
 
 String STR_REGRESSION_LINEAR
 {
-Text [ en-US ] = Linear (%SERIESNAME) ;
+Text [ en-US ] = Linear ;
 };
 String STR_REGRESSION_LOG
 {
-Text [ en-US ] = Logarithmic (%SERIESNAME) ;
+Text [ en-US ] = Logarithmic ;
 };
 String STR_REGRESSION_EXP
 {
-Text [ en-US ] = Exponential (%SERIESNAME) ;
+Text [ en-US ] = Exponential ;
 };
 String STR_REGRESSION_POWER
 {
-Text [ en-US ] = Power (%SERIESNAME) ;
+Text [ en-US ] = Power ;
 };
 String STR_REGRESSION_POLYNOMIAL
 {
-Text [ en-US ] = Polynomial (%SERIESNAME) ;
+Text [ en-US ] = Polynomial ;
 };
 String STR_REGRESSION_MOVING_AVERAGE
 {
-Text [ en-US ] = Moving average (%SERIESNAME) ;
+Text [ en-US ] = Moving average ;
 };
 
 String STR_REGRESSION_MEAN
 {
-Text [ en-US ] = Mean (%SERIESNAME) ;
+Text [ en-US ] = Mean ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx 
b/chart2/source/inc/RegressionCurveHelper.hxx
index f9637e2..58da00c 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -201,6 +201,18 @@ public:
 static OUString getUINameForRegressionCurve( const 
::com::sun::star::uno::Reference
 ::com::sun::star::chart2::XRegressionCurve  xCurve );
 
+static OUString getRegressionCurveName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
+static OUString getRegressionCurveGenericName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
+static OUString getRegressionCurveSpecificName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
 static ::std::vector ::com::sun::star::uno::Reference
 

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

[Eike Rathke]

 sc/source/filter/xml/xmlcvali.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 8047ae4a8244199717698f2e2f5281551e97912c
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 9 23:54:45 2013 +0100

be able to read the correct 'sort-ascending' value, fdo#72548

... for table:content-validation table:display-list='sort-ascending' ...
but do not write it yet.

Change-Id: I05bdf27cee27f7456b660267b95126420474eb99

diff --git a/sc/source/filter/xml/xmlcvali.cxx 
b/sc/source/filter/xml/xmlcvali.cxx
index 92a2f8d..da0a3f5 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -257,6 +257,12 @@ 
ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport rImpo
 }
 else if (IsXMLToken(sValue, XML_SORTED_ASCENDING))
 {
+// Read old wrong value, fdo#72548
+nShowList = 
sheet::TableValidationVisibility::SORTEDASCENDING;
+}
+else if (IsXMLToken(sValue, XML_SORT_ASCENDING))
+{
+// Read correct value, fdo#72548
 nShowList = 
sheet::TableValidationVisibility::SORTEDASCENDING;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |   28 +
 chart2/source/controller/dialogs/Strings_Statistic.src  |   14 +-
 chart2/source/inc/RegressionCurveHelper.hxx |   19 +++
 chart2/source/tools/RegressionCurveHelper.cxx   |   78 +---
 4 files changed, 118 insertions(+), 21 deletions(-)

New commits:
commit 09687cf4288b8ef6dbaf4908b3c7ee2ea093d928
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Dec 9 23:01:48 2013 +0100

More clearly name the trendline in chart's element selection box.

Change-Id: I5f787eb064524a3b2399d591866a5b8cbdee6294

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 648a6c7..73d8416 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -747,8 +747,8 @@ OUString ObjectNameProvider::getNameForCID(
 case OBJECTTYPE_DATA_ERRORS_X:
 case OBJECTTYPE_DATA_ERRORS_Y:
 case OBJECTTYPE_DATA_ERRORS_Z:
-case OBJECTTYPE_DATA_CURVE:
 case OBJECTTYPE_DATA_AVERAGE_LINE:
+case OBJECTTYPE_DATA_CURVE:
 case OBJECTTYPE_DATA_CURVE_EQUATION:
 {
 OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel );
@@ -766,8 +766,30 @@ OUString ObjectNameProvider::getNameForCID(
 aRet += getName( OBJECTTYPE_DATA_LABEL  );
 }
 }
+else if (eType == OBJECTTYPE_DATA_CURVE || eType == 
OBJECTTYPE_DATA_CURVE_EQUATION)
+{
+Reference chart2::XDataSeries  xSeries( 
ObjectIdentifier::getDataSeriesForCID( rObjectCID , xModel ));
+Reference chart2::XRegressionCurveContainer  xCurveCnt( 
xSeries, uno::UNO_QUERY );
+
+aRet +=  ;
+aRet += getName(eType);
+
+if( xCurveCnt.is())
+{
+sal_Int32 nCurveIndex = 
ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID );
+Reference chart2::XRegressionCurve  xCurve( 
RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) );
+if( xCurve.is())
+{
+aRet +=  (;
+aRet += 
RegressionCurveHelper::getRegressionCurveName(xCurve);
+aRet += );
+}
+}
+}
 else
+{
 aRet += getName( eType );
+}
 return aRet;
 }
 default:
diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src 
b/chart2/source/controller/dialogs/Strings_Statistic.src
index 7469f66..0be3a37 100644
--- a/chart2/source/controller/dialogs/Strings_Statistic.src
+++ b/chart2/source/controller/dialogs/Strings_Statistic.src
@@ -43,32 +43,32 @@ String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
 
 String STR_REGRESSION_LINEAR
 {
-Text [ en-US ] = Linear (%SERIESNAME) ;
+Text [ en-US ] = Linear ;
 };
 String STR_REGRESSION_LOG
 {
-Text [ en-US ] = Logarithmic (%SERIESNAME) ;
+Text [ en-US ] = Logarithmic ;
 };
 String STR_REGRESSION_EXP
 {
-Text [ en-US ] = Exponential (%SERIESNAME) ;
+Text [ en-US ] = Exponential ;
 };
 String STR_REGRESSION_POWER
 {
-Text [ en-US ] = Power (%SERIESNAME) ;
+Text [ en-US ] = Power ;
 };
 String STR_REGRESSION_POLYNOMIAL
 {
-Text [ en-US ] = Polynomial (%SERIESNAME) ;
+Text [ en-US ] = Polynomial ;
 };
 String STR_REGRESSION_MOVING_AVERAGE
 {
-Text [ en-US ] = Moving average (%SERIESNAME) ;
+Text [ en-US ] = Moving average ;
 };
 
 String STR_REGRESSION_MEAN
 {
-Text [ en-US ] = Mean (%SERIESNAME) ;
+Text [ en-US ] = Mean ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx 
b/chart2/source/inc/RegressionCurveHelper.hxx
index f9637e2..58da00c 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -201,6 +201,18 @@ public:
 static OUString getUINameForRegressionCurve( const 
::com::sun::star::uno::Reference
 ::com::sun::star::chart2::XRegressionCurve  xCurve );
 
+static OUString getRegressionCurveName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
+static OUString getRegressionCurveGenericName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
+static OUString getRegressionCurveSpecificName(
+const ::com::sun::star::uno::Reference
+::com::sun::star::chart2::XRegressionCurve  xCurve );
+
 static ::std::vector ::com::sun::star::uno::Reference
 

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

[Eike Rathke]

 sc/source/filter/xml/xmlcvali.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e485eede25b01482c7bb3c7808e9feb8f9c9d518
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 9 23:54:45 2013 +0100

be able to read the correct 'sort-ascending' value, fdo#72548

... for table:content-validation table:display-list='sort-ascending' ...
but do not write it yet.

Change-Id: I05bdf27cee27f7456b660267b95126420474eb99
(cherry picked from commit 8047ae4a8244199717698f2e2f5281551e97912c)

diff --git a/sc/source/filter/xml/xmlcvali.cxx 
b/sc/source/filter/xml/xmlcvali.cxx
index 92a2f8d..da0a3f5 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -257,6 +257,12 @@ 
ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport rImpo
 }
 else if (IsXMLToken(sValue, XML_SORTED_ASCENDING))
 {
+// Read old wrong value, fdo#72548
+nShowList = 
sheet::TableValidationVisibility::SORTEDASCENDING;
+}
+else if (IsXMLToken(sValue, XML_SORT_ASCENDING))
+{
+// Read correct value, fdo#72548
 nShowList = 
sheet::TableValidationVisibility::SORTEDASCENDING;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[haochen]

 sc/source/core/opencl/formulagroupcl.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 031738970b6635505e91065cca511f4378969cb1
Author: haochen haoc...@multicorewareinc.com
Date:   Mon Dec 9 13:07:32 2013 +0800

Release cl_memkernel after sumifs reduction kernel

Change-Id: Ibe2eccf92b5f8e7b12b5d885cb393238b16837b0
Signed-off-by: Your Name y...@example.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 665ab46..ee1b655 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1458,7 +1458,7 @@ public:
 DynamicKernelArgument *Arg = mvSubArguments[0].get();
 DynamicKernelSlidingArgumentVectorRef *slidingArgPtr =
 dynamic_cast DynamicKernelSlidingArgumentVectorRef * (Arg);
-cl_mem mpClmem2;
+mpClmem2 = NULL;
 
 if (OpSumCodeGen-NeedReductionKernel())
 {
@@ -1519,7 +1519,7 @@ public:
 err = clFinish(kEnv.mpkCmdQueue);
 if (CL_SUCCESS != err)
 throw OpenCLError(err);
-
+clReleaseKernel(redKernel);
  // Pass mpClmem2 to the real kernel
 err = clSetKernelArg(k, argno, sizeof(cl_mem), (void 
*)mpClmem2);
 if (CL_SUCCESS != err)
@@ -1616,7 +1616,16 @@ public:
 for (unsigned i = 0; i  mvSubArguments.size(); i++)
 mvSubArguments[i]-DumpInlineFun(decls,funs);
 }
+   ~DynamicKernelSoPArguments()
+{
+if (mpClmem2)
+{
+clReleaseMemObject(mpClmem2);
+mpClmem2 = NULL;
+}
+}
 private:
+cl_mem mpClmem2;
 SubArgumentsType mvSubArguments;
 boost::shared_ptrSlidingFunctionBase mpCodeGen;
 };
@@ -1676,7 +1685,7 @@ DynamicKernelArgument *VectorRefFactory(const std::string 
s,
 
 DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 const std::string s, const FormulaTreeNodeRef ft, SlidingFunctionBase* 
pCodeGen) :
-DynamicKernelArgument(s, ft), mpCodeGen(pCodeGen)
+DynamicKernelArgument(s, ft), mpCodeGen(pCodeGen),mpClmem2(NULL)
 {
 size_t nChildren = ft-Children.size();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits