Re: [PUSHED] gbuildification of jpeg
David why was this merged if you had an objection against the patch? On Fri, Oct 12, 2012 at 6:40 AM, David Tardon (via Code Review) ger...@gerrit.libreoffice.org wrote: Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/856 Objections: David Tardon: Do not submit -- To view, visit https://gerrit.libreoffice.org/856 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] gbuildification of jpeg
Hi, On Fri, Oct 12, 2012 at 08:16:39AM +0200, Jonathan Aquilina wrote: David why was this merged if you had an objection against the patch? I only had objections against the original version. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/drawingml/textparagraph.cxx |7 ---
oox/source/drawingml/textparagraphproperties.cxx | 19 +--
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 3863ac87f7fcc9b59e2768f5cc9a8779b5d21d17
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Oct 11 14:59:33 2012 +0530
n#778854: Fixes quite some issues with bullet points.
* Properties needs to be combined before applyed.
Rather than applying them separately twice.
* ParaMargins set to zero wrongly rather than boost::none
This caused its own set of problems.
* Hack: Push default zero to tabstops. This makes impress
calculate proper values for tabstops using leftmargin.
Conflicts:
oox/source/drawingml/textparagraph.cxx
Change-Id: Ic92b4963525d713cdbe5f1c16abcdfa352c61512
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index 1e2d8e2..9f0b29d 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -112,15 +112,16 @@ void TextParagraph::insertAt(
float fCharacterSize = nCharHeight 0 ? GetFontHeight( nCharHeight )
: 18;
if ( pTextParagraphStyle.get() )
{
-pTextParagraphStyle-pushToPropSet( rFilterBase, xProps,
aioBulletList, NULL, sal_True, fCharacterSize );
+TextParagraphProperties aParaProp;
+aParaProp.apply( *pTextParagraphStyle );
+aParaProp.apply( maProperties );
+aParaProp.pushToPropSet( rFilterBase, xProps, aioBulletList,
pTextParagraphStyle-getBulletList(), sal_True, fCharacterSize, true );
fCharacterSize = pTextParagraphStyle-getCharHeightPoints(
fCharacterSize );
// bullets have same color as following texts by default
if( !aioBulletList.hasProperty( PROP_BulletColor )
maRuns.size() 0
(*maRuns.begin())-getTextCharacterProperties().maCharColor.isUsed() )
aioBulletList[ PROP_BulletColor ] =
(*maRuns.begin())-getTextCharacterProperties().maCharColor.getColor(
rFilterBase.getGraphicHelper() );
-
-maProperties.pushToPropSet( rFilterBase, xProps, aioBulletList,
pTextParagraphStyle-getBulletList(), sal_True, fCharacterSize );
}
// empty paragraphs do not have bullets in ppt
diff --git a/oox/source/drawingml/textparagraphproperties.cxx
b/oox/source/drawingml/textparagraphproperties.cxx
index abd0b3b..0ca8641 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -35,6 +35,7 @@
#include com/sun/star/awt/XBitmap.hpp
#include com/sun/star/graphic/XGraphic.hpp
#include com/sun/star/beans/PropertyValue.hpp
+#include com/sun/star/style/TabStop.hpp
#include oox/helper/helper.hxx
#include oox/helper/propertyset.hxx
@@ -426,12 +427,15 @@ void TextParagraphProperties::pushToPropSet( const
::oox::core::XmlFilterBase* p
if ( noParaLeftMargin )
{
rioBulletMap[ PROP_LeftMargin ] = static_cast sal_Int32 (
*noParaLeftMargin );
-noParaLeftMargin = boost::optional sal_Int32 ( 0 );
+noParaLeftMargin = boost::none;
}
if ( noFirstLineIndentation )
{
+// Force Paragraph property as zero - impress seems to use the
value from previous
+// (non) bullet line if not set to zero explicitly :(
+aPropSet.setProperty( PROP_ParaFirstLineIndent, 0 );
rioBulletMap[ PROP_FirstLineOffset ] = static_cast sal_Int32 (
*noFirstLineIndentation );
-noFirstLineIndentation = boost::optional sal_Int32 ( 0 );
+noFirstLineIndentation = boost::none;
}
if ( nNumberingType != NumberingType::BITMAP
!rioBulletMap.hasProperty( PROP_BulletColor ) pFilterBase )
rioBulletMap[ PROP_BulletColor ] = static_cast sal_Int32 (
maTextCharacterProperties.maCharColor.getColor(
pFilterBase-getGraphicHelper()));
@@ -467,7 +471,18 @@ void TextParagraphProperties::pushToPropSet( const
::oox::core::XmlFilterBase* p
if ( noParaLeftMargin )
aPropSet.setProperty( PROP_ParaLeftMargin, sal_Int32(
*noParaLeftMargin ) );
if ( noFirstLineIndentation )
+{
aPropSet.setProperty( PROP_ParaFirstLineIndent,
*noFirstLineIndentation );
+if( bPushDefaultValues )
+{
+// Reset TabStops - these would be auto calculated by Impress
+TabStop aTabStop;
+aTabStop.Position = 0;
+Sequence TabStop aSeq(1);
+aSeq[0] = aTabStop;
+aPropSet.setProperty( PROP_ParaTabStops, aSeq );
+}
+}
}
float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] .: jpeg/StaticLibrary_jpeg.mk RepositoryExternal.mk solenv/inc
RepositoryExternal.mk |4 ++-- jpeg/StaticLibrary_jpeg.mk |8 solenv/inc/libs.mk |6 +- 3 files changed, 7 insertions(+), 11 deletions(-) New commits: commit 4ed91fd1633e90b8d1f872aa7ed023431958bd23 Author: David Tardon dtar...@redhat.com Date: Fri Oct 12 09:32:02 2012 +0200 do not play stupid games with jpeg vs. jpeglib Change-Id: I72ed637ecec5aff7528ff724b2665e22650c224b diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b3b2e5..81f412d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -200,7 +200,7 @@ endef else # !SYSTEM_JPEG $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - jpeglib \ + jpeg \ )) define gb_LinkTarget__use_jpeg @@ -210,7 +210,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - jpeglib \ + jpeg \ ) endef diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk index d4846e0..91e3773 100644 --- a/jpeg/StaticLibrary_jpeg.mk +++ b/jpeg/StaticLibrary_jpeg.mk @@ -7,13 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,jpeglib)) +$(eval $(call gb_StaticLibrary_StaticLibrary,jpeg)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeglib)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg)) -$(eval $(call gb_StaticLibrary_use_unpacked,jpeglib,jpeg)) +$(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg)) -$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeglib,\ +$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\ UnpackedTarball/jpeg/jaricom \ UnpackedTarball/jpeg/jcapimin \ UnpackedTarball/jpeg/jcapistd \ diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 0f25a6b..f705d5f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -193,11 +193,7 @@ MINIZIP3RDLIB=$(MINIZIP_LIBS) # internally, minizip is included in zlib MINIZIP3RDLIB= .ENDIF -.IF $(SYSTEM_JPEG)==YES JPEG3RDLIB=-ljpeg -.ELSE -JPEG3RDLIB=-ljpeglib -.ENDIF .IF $(SYSTEM_DB) == YES BERKELEYLIB=-l$(DB_LIB) .ELIF $(GUI)$(COM)==WNTGCC @@ -445,7 +441,7 @@ CLUCENELIB=iclucene.lib EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib ZLIB3RDLIB=zlib.lib -JPEG3RDLIB=jpeglib.lib +JPEG3RDLIB=jpeg.lib BERKELEYLIB=libdb47.lib CURLLIB=libcurl.lib CHAOSLIB=ichaos.lib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - framework/source vcl/source
framework/source/layoutmanager/helpers.cxx |4 ++--
framework/source/services/substitutepathvars.cxx |3 +--
vcl/source/window/builder.cxx|9 -
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 2dd0712a125a8dcdb5510bc36f06d103d6abdf58
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 09:22:23 2012 +0100
loplugin: unused Strings
Change-Id: Ie9c888a48716e4bfd24ae78eef5f6e4a54dd1810
diff --git a/framework/source/layoutmanager/helpers.cxx
b/framework/source/layoutmanager/helpers.cxx
index 064407a..1f9a037 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -218,7 +218,7 @@ WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
{
sal_Int32 nIndex = 0;
::rtl::OUString aPathPart = aResourceURL.copy(
aUIResourceURL.getLength() );
-::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/',
nIndex );
+aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
return aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
}
@@ -233,7 +233,7 @@ void parseResourceURL( const rtl::OUString aResourceURL,
rtl::OUString aElemen
{
sal_Int32 nIndex = 0;
::rtl::OUString aPathPart = aResourceURL.copy(
aUIResourceURL.getLength() );
-::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/',
nIndex );
+aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
aElementType = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
aElementName = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index fbab8a4..f554854 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1161,8 +1161,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables(
PredefinedPathVariable
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
Any aAny;
-::rtl::OUString aTmp;
-String aResult;
// Get inspath and userpath from bootstrap mechanism in every case as file
URL
::utl::Bootstrap::PathStatus aState;
@@ -1235,6 +1233,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables(
PredefinedPathVariable
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PATH ] = GetPathVariableValue();
// Set $(temp)
+OUString aTmp;
osl::FileBase::getTempDirURL( aTmp );
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL(
aTmp );
}
commit 5551d2776dbfa921d5520e8b09bf5caf4649a545
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 11 21:29:24 2012 +0100
handle ui-previewer on .ui in cwd
Change-Id: If13c5494ffb960e943fa8d2c99f2da28b5f95736
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 53ffa37..75d2523 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -78,7 +78,14 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir,
OUString sUIFile, OStri
{
OUStringBuffer aTransBuf;
sal_Int32 nLastSlash = sUri.lastIndexOf('/');
-aTransBuf.append(sUri.copy(0,
nLastSlash)).append(/res/).append(aLocale.Language);
+if (nLastSlash != -1)
+aTransBuf.append(sUri.copy(0, nLastSlash));
+else
+{
+aTransBuf.append('.');
+nLastSlash = 0;
+}
+aTransBuf.append(/res/).append(aLocale.Language);
switch (i)
{
case 0:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - tools/inc vcl/inc
tools/inc/tools/bigint.hxx |2 +-
tools/inc/tools/color.hxx |2 +-
vcl/inc/vcl/layout.hxx |5 +
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d0144bcb8899845982a8172d870f337533adaf35
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 10:15:36 2012 +0100
Resolves: fdo#55807 crash in tools-outline numbering
Change-Id: I4233fa63d49ed0a3ec3de7fe04eadead9fa7d1bf
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 29fa382..5e22537 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -314,6 +314,11 @@ private:
{
int x;
int y;
+ExtendedGridEntry()
+: x(0)
+, y(0)
+{
+}
};
typedef boost::multi_arrayExtendedGridEntry, 2 ext_array_type;
commit 639c256dc5f4694b7204773ea4661084289c8b81
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 09:42:37 2012 +0100
loplugin: markup some more suitable classes with SAL_WARN_UNUSED
Change-Id: Ia89ef962aed9ecd1e907c9f46e2f05a7018ca8a0
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 0637ddd..8570856 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -36,7 +36,7 @@ namespace binfilter { class SbxINT64Converter; }
class Fraction;
-class TOOLS_DLLPUBLIC BigInt
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED BigInt
{
#ifdef _TLBIGINT_INT64
friend class ::binfilter::SbxINT64Converter;
diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index 59f28d9..823f341 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -89,7 +89,7 @@ typedef sal_uInt32 ColorData;
// Color
-class TOOLS_DLLPUBLIC Color
+class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Color
{
protected:
ColorData mnColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55807, which changed state. Bug 55807 Summary: CRASH when accessing Tools Outline Numbering... https://bugs.freedesktop.org/show_bug.cgi?id=55807 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: where to change the %version
Hi there, On Fri, 2012-10-12 at 09:40 +0800, huqitu du wrote: I want to change the %version Variable, and whare to find the defination? %version is an unusual mangling; I think we only use this for generating RPMs - so git grep is really your friend in this regard: $ git grep %version solenv/bin/modules/installer/epmfile.pm:# %version 2.0 solenv/bin/modules/installer/epmfile.pm:# This release version has to be listed in the line %version : %version versionnumber releasenumber solenv/bin/modules/installer/epmfile.pm:$line = %version . . $installer::globals::packageversion . \n; sysui/desktop/freedesktop/freedesktop-menus.spec:Version: %version sysui/desktop/mandriva/mandriva-menus.spec:Version: %version sysui/desktop/mandriva/mandriva-menus.spec:%define menuversion %(echo %version|cut -d'.' -f 1-2) sysui/desktop/suse/suse-menus.spec:Version: %version So it clearly comes from $installer::globals somehow. Of course, the other way to hunt this down is probably to go top-down instead of bottom up. All variables from configure are propagated to the code via config_host.mk (which is generated from the .in by running configure / autogen.sh). There we have things like: export PRODUCTNAME=LibreOffice export PRODUCTVERSION=3.7 Which seems to suggest this is all configureable via configure. But of course - I'm no packaging expert. Does that help ? ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: bug 53673; writer hacker help requested ...
Hi Caolán, https://bugs.freedesktop.org/show_bug.cgi?id=53673 Cedric seems to have had a look and the bug is closed. Presumably it's taken care of now. Michael Meeks closed the bug as my patch removed the symptoms and suggested to open a separate bug for remaining issues (comment 44). So I think -unless Cedric found something or concluded that my pre-patch code was defective and worked in version 3.5 by sheer luck- that the issue (lay out distortion when saving a label document) is still open. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55560, which changed state. Bug 55560 Summary: EDITING: CRASH when Format Cells (menu and Context menu) https://bugs.freedesktop.org/show_bug.cgi?id=55560 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/uiconfig sw/uiconfig vcl/source
cui/uiconfig/ui/charnamepage.ui |8
sw/uiconfig/swriter/ui/sortdialog.ui |2 +-
vcl/source/window/builder.cxx|2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0ac7f6120eab04a95185342e935c0bbca4d8cc43
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 10:43:00 2012 +0100
Resolves: fdo#55685 SvxLanguageBox is in svxcore not in svx
Change-Id: I50f68674e057dd358357d611b3332d8cd00b
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 05d2527..aebb93a 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -84,7 +84,7 @@
/packing
/child
child
- object class=svxlo:SvxLanguageBox id=westlanglb-nocjk
+ object class=svxcorelo:SvxLanguageBox
id=westlanglb-nocjk
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
@@ -285,7 +285,7 @@
/packing
/child
child
- object class=svxlo:SvxLanguageBox id=westlanglb-cjk
+ object class=svxcorelo:SvxLanguageBox id=westlanglb-cjk
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
@@ -434,7 +434,7 @@
/packing
/child
child
- object class=svxlo:SvxLanguageBox id=eastlanglb
+ object class=svxcorelo:SvxLanguageBox id=eastlanglb
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
@@ -583,7 +583,7 @@
/packing
/child
child
- object class=svxlo:SvxLanguageBox id=ctllanglb
+ object class=svxcorelo:SvxLanguageBox id=ctllanglb
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui
b/sw/uiconfig/swriter/ui/sortdialog.ui
index bd0223e..4018d1e 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -697,7 +697,7 @@
property name=can_focusFalse/property
property name=left_padding12/property
child
- object class=svxlo:SvxLanguageBox id=langlb
+ object class=svxcorelo:SvxLanguageBox id=langlb
property name=visibleTrue/property
property name=can_focusFalse/property
/object
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 75d2523..2938653 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -785,7 +785,7 @@ Window *VclBuilder::makeObject(Window *pParent, const
OString name, const OStri
pWindow = (*pFunction)(pParent, rMap);
}
}
-SAL_WARN_IF(!pWindow, vcl.layout, problably need to implement
name.getStr() or add a make name.getStr() function);
+SAL_WARN_IF(!pWindow, vcl.layout, probably need to implement
name.getStr() or add a make name.getStr() function);
if (pWindow)
{
pWindow-SetHelpId(m_sHelpRoot + id);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55685, which changed state. Bug 55685 Summary: CRASH when create or modify Character Style or Paragraph Style https://bugs.freedesktop.org/show_bug.cgi?id=55685 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source
svtools/source/control/inettbc.cxx |1 -
svtools/source/dialogs/filedlg2.cxx |9 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 49ebf4f91d14af51bc3772c675de19b5891e3d36
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 11:38:40 2012 +0100
loplugin: unused string and misleading if/else indent
Change-Id: Idd0c4195e5988b3a0ee64282463db44e43d0c597
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index b0d80e7..490a818 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -725,7 +725,6 @@ void SvtURLBox::TryAutoComplete( sal_Bool bForce )
{
if( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) return;
-String aMatchString;
String aCurText = GetText();
Selection aSelection( GetSelection() );
if( aSelection.Max() != aCurText.Len() !bForce )
diff --git a/svtools/source/dialogs/filedlg2.cxx
b/svtools/source/dialogs/filedlg2.cxx
index 2e13038..b5b2dfd 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -316,13 +316,11 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
}
}
}
-else
-if ( pBtn == pCancelBtn )
+else if ( pBtn == pCancelBtn )
{
GetPathDialog()-EndDialog( sal_False );
}
-else
-if ( pBtn == pHomeBtn )
+else if ( pBtn == pHomeBtn )
{
::rtl::OUString aHomeDir;
osl::Security aSecurity;
@@ -336,8 +334,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
}
}
}
-else
-if ( pBtn == pNewDirBtn )
+else if ( pBtn == pNewDirBtn )
{
DirEntry aFile( pEdit-GetText() );
if( ! aFile.Exists() ! FileStat( aFile ).IsKind( FSYS_KIND_WILD ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - extras/source
extras/source/palettes/standard.soc | 43 +++- 1 file changed, 42 insertions(+), 1 deletion(-) New commits: commit 3bc6359eeb70affd7720bcd29a7a9f97cea9b011 Author: Petr Mladek pmla...@suse.cz Date: Fri Aug 5 17:30:09 2011 +0200 Adding SUSE and Novell Color Palette diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 6361f7b..a2aac27 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -86,8 +86,49 @@ draw:color draw:name=Pale yellow draw:color=#cc/ draw:color draw:name=Pale green draw:color=#cc/ draw:color draw:name=Dark violet draw:color=#660066/ - draw:color draw:name=Salmon draw:color=#ff8080/ draw:color draw:name=Sea blue draw:color=#0066cc/ + draw:color draw:name=SUSE Green draw:color=#7ac142/ + draw:color draw:name=SUSE Blue Green draw:color=#006f66/ + draw:color draw:name=SUSE Dark Neutral draw:color=#454c51/ + draw:color draw:name=SUSE Bright Blue draw:color=#00aeef/ + draw:color draw:name=SUSE Bright Green draw:color=#c1d82f/ + draw:color draw:name=SUSE Bright Orange draw:color=#f8981d/ + draw:color draw:name=SUSE Bright Yellow draw:color=#ffdd00/ + draw:color draw:name=SUSE Bright Magenta draw:color=#ec008c/ + draw:color draw:name=SUSE Bright Red draw:color=#ed1c24/ + draw:color draw:name=SUSE Medium Dark Neutral draw:color=#6a737b/ + draw:color draw:name=SUSE Medium Neutral draw:color=#94a0a9/ + draw:color draw:name=SUSE Light Neutral draw:color=#e4e5e6/ + draw:color draw:name=SUSE Tint Neutral draw:color=#eff0f0/ + draw:color draw:name=SUSE Dark Blue draw:color=#007fb2/ + draw:color draw:name=SUSE Medium Blue draw:color=#63cae1/ + draw:color draw:name=SUSE Light Blue draw:color=#ade0ee/ + draw:color draw:name=SUSE Tint Blue draw:color=#ddf1f7/ + draw:color draw:name=SUSE Dark Green draw:color=#439539/ + draw:color draw:name=SUSE Medium Green draw:color=#7ac142/ + draw:color draw:name=SUSE Light Green draw:color=#d0e4a6/ + draw:color draw:name=SUSE Tint Green draw:color=#ebf6dc/ + draw:color draw:name=SUSE Dark Yellow draw:color=#e37f1c/ + draw:color draw:name=SUSE Medium Yellow draw:color=#f7ac07/ + draw:color draw:name=SUSE Light Yellow draw:color=#ffd457/ + draw:color draw:name=SUSE Tint Yellow draw:color=#fff6d4/ + draw:color draw:name=SUSE Dark Teal draw:color=#5a9a98/ + draw:color draw:name=SUSE Medium Teal draw:color=#72aeb6/ + draw:color draw:name=SUSE Light Teal draw:color=#c3dfe0/ + draw:color draw:name=SUSE Tint Teal draw:color=#d8e9e8/ + draw:color draw:name=SUSE Dark Purple draw:color=#363c74/ + draw:color draw:name=SUSE Medium Purple draw:color=#546291/ + draw:color draw:name=SUSE Light Purple draw:color=#b5bbd4/ + draw:color draw:name=SUSE Tint Purple draw:color=#dee6f3/ + draw:color draw:name=Novell red draw:color=#e0/ + draw:color draw:name=Novell orange draw:color=#e67814/ + draw:color draw:name=Novell yellow draw:color=#ffdd00/ + draw:color draw:name=Novell green draw:color=#629e1f/ + draw:color draw:name=Novell teal draw:color=#6ea19b/ + draw:color draw:name=Novell blue draw:color=#1c82b9/ + draw:color draw:name=Novell light gray draw:color=#cd/ + draw:color draw:name=Novell medium gray draw:color=#5a5a64/ + draw:color draw:name=Novell dark gray draw:color=#3c3c41/ draw:color draw:name=Chart 1 draw:color=#004586/ draw:color draw:name=Chart 2 draw:color=#ff420e/ draw:color draw:name=Chart 3 draw:color=#ffd320/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - compilerplugins/clang
compilerplugins/clang/unusedvariablecheck.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d1eee073ebcd2d4a99209bb12ab13a7cafbb5a89
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Oct 12 13:09:08 2012 +0200
avoid crash on pointers to functions
Clang's dyn_cast crashes on NULL, and getParentFunctionOrMethod() is NULL
if the parameter is a part of a pointer-to-function declaration.
Change-Id: Iee9eef488746f9a46bc090df8d318f27ad65f0ef
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx
b/compilerplugins/clang/unusedvariablecheck.cxx
index 65cac75..7d9a170 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -83,7 +83,7 @@ bool UnusedVariableCheck::VisitNamedDecl( NamedDecl*
declaration )
return true; // unnamed parameter - unused
// If this declaration does not have a body, then the
parameter is indeed not used,
// so ignore.
-if( const FunctionDecl* func = dyn_cast FunctionDecl (
param-getParentFunctionOrMethod()))
+if( const FunctionDecl* func = dyn_cast_or_null FunctionDecl
( param-getParentFunctionOrMethod()))
if( !func-doesThisDeclarationHaveABody())
return true;
report( DiagnosticsEngine::Warning, unused parameter %0
[loplugin],
commit 9c0304f5a725ad0a58afecb96862ecd298ffec06
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Oct 12 12:59:31 2012 +0200
do not report unnamed parameters as unused
Change-Id: I0cc44354085fbee15aa94d23c29830fd40e8d939
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx
b/compilerplugins/clang/unusedvariablecheck.cxx
index f291632..65cac75 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -79,6 +79,8 @@ bool UnusedVariableCheck::VisitNamedDecl( NamedDecl*
declaration )
{
if( const ParmVarDecl* param = dyn_cast ParmVarDecl ( var ))
{
+if( !param-getDeclName())
+return true; // unnamed parameter - unused
// If this declaration does not have a body, then the
parameter is indeed not used,
// so ignore.
if( const FunctionDecl* func = dyn_cast FunctionDecl (
param-getParentFunctionOrMethod()))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: where to change the %version
On Fri, 2012-10-12 at 10:34 +0100, Michael Meeks wrote: Hi there, On Fri, 2012-10-12 at 09:40 +0800, huqitu du wrote: I want to change the %version Variable, and whare to find the defination? %version is an unusual mangling; I think we only use this for generating RPMs - so git grep is really your friend in this regard: $ git grep %version solenv/bin/modules/installer/epmfile.pm:# %version 2.0 solenv/bin/modules/installer/epmfile.pm:# This release version has to be listed in the line %version : %version versionnumber releasenumber solenv/bin/modules/installer/epmfile.pm:$line = %version . . $installer::globals::packageversion . \n; sysui/desktop/freedesktop/freedesktop-menus.spec:Version: %version sysui/desktop/mandriva/mandriva-menus.spec:Version: %version sysui/desktop/mandriva/mandriva-menus.spec:%define menuversion %(echo %version|cut -d'.' -f 1-2) sysui/desktop/suse/suse-menus.spec:Version: %version So it clearly comes from $installer::globals somehow. Of course, the other way to hunt this down is probably to go top-down instead of bottom up. All variables from configure are propagated to the code via config_host.mk (which is generated from the .in by running configure / autogen.sh). There we have things like: export PRODUCTNAME=LibreOffice export PRODUCTVERSION=3.7 Which seems to suggest this is all configureable via configure. I am afraid that the configure version is not propagated to the rpm spec file Version tag :-( I think that the perl installer (solenv/bin/modules/installer/epmfile.pm) takes the values from instsetoo_native/util/openoffice.lst The destop integration packages are another story. They are built separately in the sysui module. You might want to look at sysui/desktop/productversion.mk and solenv/inc/productversion.mk. Note that touching these variables might have strange side effects because they are used on different locations during build, installation and runtime. Any volunteer who would like to clean up the mess is welcome. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/uiconfig vcl/inc vcl/source
sw/uiconfig/sw/ui/20872.ui | 43 ---
vcl/inc/vcl/layout.hxx |4 ++--
vcl/source/window/layout.cxx |8
3 files changed, 30 insertions(+), 25 deletions(-)
New commits:
commit 12a971118f732858bd288e6fd5b38b17b7c560e8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 12:50:56 2012 +0100
don't process empty grid cells
Change-Id: Ibd8ea6a40ced219c5f64d1c04df28b85c99a00bb
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 5e22537..43fc7a9 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -315,8 +315,8 @@ private:
int x;
int y;
ExtendedGridEntry()
-: x(0)
-, y(0)
+: x(-1)
+, y(-1)
{
}
};
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 836b6a8..8336a08 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -427,6 +427,14 @@ VclGrid::array_type VclGrid::assembleGrid() const
for (sal_Int32 y = 0; y nMaxY; ++y)
{
ExtendedGridEntry rSpan = A[x][y];
+//cell x/y is spanned by the widget at cell rSpan.x/rSpan.y,
+//just points back to itself if there's no cell spanning
+if ((rSpan.x == -1) || (rSpan.y == -1))
+{
+//there is no entry for this cell, i.e. this is a cell
+//with no widget in it, or spanned by any other widget
+continue;
+}
ExtendedGridEntry rEntry = A[rSpan.x][rSpan.y];
if (aNonEmptyCols[x] == false)
--rEntry.nSpanWidth;
commit 6b459bf06c10ee05ff1b6d5db8c3e30fa2774a9e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 11:49:54 2012 +0100
tweak dialog to show label again
Change-Id: I8b2e61a2754190eb3bd218242485a6bbce41aa7d
diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index a06270d..879e210 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -29,6 +29,23 @@
/row
/data
/object
+ object class=GtkListStore id=liststore2
+columns
+ !-- column-name gchararray1 --
+ column type=gchararray/
+/columns
+data
+ row
+col id=0 translatable=yesTap stop/col
+ /row
+ row
+col id=0 translatable=yesSpace/col
+ /row
+ row
+col id=0 translatable=yesNothing/col
+ /row
+/data
+ /object
object class=GtkBox id=20872
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -100,7 +117,6 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=xalign0/property
-property name=hexpandTrue/property
property name=label translatable=yesNumbering
followed by/property
/object
packing
@@ -300,14 +316,15 @@
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultFalse/property
+property name=halignend/property
property name=use_action_appearanceFalse/property
property name=xalign0/property
property name=draw_indicatorTrue/property
/object
packing
-property name=left_attach1/property
+property name=left_attach0/property
property name=top_attach6/property
-property name=width1/property
+property name=width2/property
property name=height1/property
/packing
/child
@@ -396,9 +413,6 @@
property name=height1/property
/packing
/child
-child
- placeholder/
-/child
/object
packing
property name=expandFalse/property
@@ -426,21 +440,4 @@
/packing
/child
/object
- object class=GtkListStore id=liststore2
-columns
- !-- column-name gchararray1 --
- column type=gchararray/
-/columns
-data
- row
-col id=0 translatable=yesTap stop/col
- /row
- row
-col id=0 translatable=yesSpace/col
- /row
- row
-col id=0 translatable=yesNothing/col
- /row
-/data
- /object
/interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/templatedlg.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 581438a0c609c957e2db0b262b3bea83fa387eac Author: Caolán McNamara caol...@redhat.com Date: Fri Oct 12 13:03:42 2012 +0100 lcl_createTemplate declared but not defined Change-Id: I755853c326c5e3dbeae18e3fdb9f7b5607aac874 diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index c79c779..ca5e0b3 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -64,8 +64,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; -static void lcl_createTemplate(uno::ReferenceXComponentLoader xDesktop, const FILTER_APPLICATION eApp); - static bool lcl_getServiceName (const OUString rFileURL, OUString rName ); static std::vectorOUString lcl_getAllFactoryURLs (); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optlingu.cxx | 13 -
1 file changed, 13 deletions(-)
New commits:
commit 2d4d38bcf2791e9e0805f5a61e2f7d48f4c7a2a6
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 13:12:22 2012 +0100
lcl_Bool2Any is unused
Change-Id: Ida5baa01cb3ce7fd611360e122f9f8ffebd9e7d8
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index dab862d..07c5ddc 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1195,19 +1195,6 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
//
-static Any lcl_Bool2Any(sal_Bool bVal)
-{
-Any aRet(bVal, ::getBooleanCppuType());
-return aRet;
-}
-
-
-static sal_Bool lcl_Bool2Any(Any rVal)
-{
-return *(sal_Bool*)rVal.getValue();
-}
-
-
sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet rCoreSet )
{
sal_Bool bModified = sal_True; //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optlingu.cxx | 13 -
1 file changed, 13 deletions(-)
New commits:
commit 57cd67224ab349f7738f4429f3adc569b7bacb11
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 13:14:47 2012 +0100
lcl_GetServiceName unused
Change-Id: Iea5b8de7c937f27beb0e95b40412dc56391c02f7
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 07c5ddc..9beea46 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -2107,19 +2107,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl,
SvTreeListBox *, pBox )
return 0;
}
-static OUString lcl_GetServiceName(sal_uInt8 nType)
-{
-switch(nType)
-{
-case TYPE_SPELL: return OUString(cSpell);
-case TYPE_GRAMMAR : return OUString(cGrammar);
-case TYPE_HYPH : return OUString(cHyph);
-case TYPE_THES : return OUString(cThes);
-}
-return OUString();
-}
-
-
IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
{
LanguageType eCurLanguage = aLanguageLB.GetSelectLanguage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/attarray.cxx | 25 -
1 file changed, 25 deletions(-)
New commits:
commit ac334eeac573fcc38a4ba6afa34e967f13154030
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 13:24:59 2012 +0100
lcl_LineSize is unused
Change-Id: Ied166af182c76d72c2934f7d3a7279aa0cd63a62
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index d3ea03d..3965890 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1208,31 +1208,6 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem*
pLineOuter, const SvxBoxInf
}
}
-
-static long lcl_LineSize( const SvxBorderLine rLine )
-{
-// only one line - half width, min. 20
-// double line - half line spacing + (per min. 20)
-
-long nTotal = 0;
-sal_uInt16 nWidth = Max( rLine.GetOutWidth(), rLine.GetInWidth() );
-sal_uInt16 nDist = rLine.GetDistance();
-if (nDist)
-{
-OSL_ENSURE( rLine.GetOutWidth() rLine.GetInWidth(),
-Line has a distance, but only a width? );
-
-nTotal += ( nDist 20 ) ? nDist : 20;
-nTotal += ( nWidth 20 ) ? nWidth : 20;
-}
-else if (nWidth)
-nTotal += ( nWidth 20 ) ? nWidth : 20;
-
-// also halved ?
-
-return nTotal;
-}
-
// Test if field contains specific attribute
bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpobject.cxx | 29 -
sc/source/core/data/drwlayer.cxx |6 --
sc/source/filter/excel/excimp8.cxx |3 ---
3 files changed, 38 deletions(-)
New commits:
commit 0b876ce56cbd63fbc44e5ba13433d0051fbc1108
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 13:35:38 2012 +0100
remove unused local static functions
Change-Id: I2b5e16165ac2de4753d9687a2bfc146d11a2bcd9
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 95b0307..81888fd 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1870,20 +1870,6 @@ void ScDPObject::ToggleDetails(const
DataPilotTableHeaderData rElemDesc, ScDPOb
}
}
-static long lcl_FindName( const rtl::OUString rString, const
uno::Referencecontainer::XNameAccess xCollection )
-{
-if ( xCollection.is() )
-{
-uno::Sequencertl::OUString aSeq = xCollection-getElementNames();
-long nCount = aSeq.getLength();
-const rtl::OUString* pArr = aSeq.getConstArray();
-for (long nPos=0; nPosnCount; nPos++)
-if ( pArr[nPos] == rString )
-return nPos;
-}
-return -1; // not found
-}
-
static sal_uInt16 lcl_FirstSubTotal( const
uno::Referencebeans::XPropertySet xDimProp ) // PIVOT_FUNC mask
{
uno::Referencesheet::XHierarchiesSupplier xDimSupp( xDimProp,
uno::UNO_QUERY );
@@ -1933,21 +1919,6 @@ static sal_uInt16 lcl_FirstSubTotal( const
uno::Referencebeans::XPropertySet
return 0;
}
-static sal_uInt16 lcl_CountBits( sal_uInt16 nBits )
-{
-if (!nBits) return 0;
-
-sal_uInt16 nCount = 0;
-sal_uInt16 nMask = 1;
-for (sal_uInt16 i=0; i16; i++)
-{
-if ( nBits nMask )
-++nCount;
-nMask = 1;
-}
-return nCount;
-}
-
namespace {
class FindByColumn : public std::unary_functionPivotField, bool
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e6c3ad4..61db8db 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -186,12 +186,6 @@ inline void ReverseTwipsToMM( long nVal )
nVal = HmmToTwips (nVal);
}
-static void lcl_ReverseTwipsToMM( Point rPoint )
-{
-ReverseTwipsToMM( rPoint.X() );
-ReverseTwipsToMM( rPoint.Y() );
-}
-
static void lcl_ReverseTwipsToMM( Rectangle rRect )
{
ReverseTwipsToMM( rRect.Left() );
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index 89f0074..50a7870 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -199,9 +199,6 @@ public:
}
};
-// defined in docfunc.cxx ( really this needs a new name )
-static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell rDocSh, String
sModule );
-
ImportExcel8::ImportExcel8( XclImpRootData rImpData, SvStream rStrm ) :
ImportExcel( rImpData, rStrm )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/data/dpcache.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 14a24950c56d85e275ea2b2fd13e5cefc25d6635
Author: Michael Meeks michael.me...@suse.com
Date: Tue Sep 18 10:17:48 2012 +0100
WaE: calm android tinderboxen
Change-Id: Iaeb809770acec4b3c38e42038fe2820b2da2051d
(cherry picked from commit 0edc04d2d659456f5c22406a79901d54c530a979)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index c754fba..44af011 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -756,11 +756,11 @@ void ScDPCache::PostInit()
maEmptyRows.build_tree();
typedef mdds::flat_segment_treeSCROW, bool::const_reverse_iterator
itr_type;
-itr_type it = maEmptyRows.rbegin(), itEnd = maEmptyRows.rend();
-OSL_ENSURE(it != itEnd, corrupt flat_segment_tree instance!);
+itr_type it = maEmptyRows.rbegin();
+OSL_ENSURE(it != maEmptyRows.rend(), corrupt flat_segment_tree
instance!);
mnDataSize = maFields[0].maData.size();
++it; // Skip the first position.
-OSL_ENSURE(it != itEnd, buggy version of flat_segment_tree is used.);
+OSL_ENSURE(it != maEmptyRows.rend(), buggy version of flat_segment_tree
is used.);
if (it-second)
{
SCROW nLastNonEmpty = it-first - 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6, 3-6-3] fix fdo#47669: check for started hyperlink before closing
Hello all, I'd like to propose the attached patch fixing fdo#47669 into -3-6 and -3-6-3 branches. Explanation is in commit message. I've compiled and tested on -3-6 branch at 0eee6469304ba15f42bcafb6707cc98bcbff9112, and it worked fine. Best Regards, -- Korrawit Pruegsanusak 0001-Fix-fdo-47669-also-check-if-we-started-the-tag-befor.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/bastype2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ceb06a8f0906dd9bd7aa69b121a050eb4dcc861e
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Wed Oct 10 12:06:14 2012 -0300
766 gerrit patch, fix appendAscii in bastype2.cxx
Change-Id: I4409d1b0585a8c52cba14d1e67ccf776c6070c8a
Reviewed-on: https://gerrit.libreoffice.org/854
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index db20813..8ef1a92 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -480,7 +480,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode(
SvLBoxEntry* pLibSubRootEn
ModuleInfoHelper::getObjectName( xLib, aModName, sObjName );
if( !sObjName.isEmpty() )
{
-aEntryNameBuf.appendAscii( ( );
+aEntryNameBuf.append( ( );
aEntryNameBuf.append(sObjName);
aEntryNameBuf.append(')');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] 766 gerrit patch, fix appendAscii in bastype2.cxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/854 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/854 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4409d1b0585a8c52cba14d1e67ccf776c6070c8a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is the lcl_LocalFunction naming convention useful?
On Tuesday 09 of October 2012, Tor Lillqvist wrote:
Where did this lcl_ convention come from? The lcl_ prefix has no
meaning to a compiler or linker. If the intent is to make such
functions file-local, why not use the static keyword, or an anonymous
namespace instead, so that they actually *are* local also to the
tool-chain? (You can still keep the lcl_ prefix if you love it.)
...
(I am complaining because when attempting to link shitloads of LO code
into one executable / shared library, whicih I am experimenting with
for Android and which is necessary for iOS, such functions that have
identical mangled names, from separate modules, *will* clash. Sure,
it's trivial for me to then change the functions into static, but a
bit tedious.)
For the record, I wanted to give you a patch from a compiler plugin adding
static before every lcl_ where it was missing, but since those 1000+ places
made the patch quite big, I've pushed it directly after fixing the few cases
where the lcl_ function actually wasn't local at all ('few' was a silly
assumption on my part BTW, there were even a number of lcl_ functions that
actually had extern declarations in headers, so much for there being much
point in this convention).
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
0 files changed New commits: commit e02ff224b64671db33543a1be2b48c0fa5caf786 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Oct 12 17:04:31 2012 +0200 fix file permissions Change-Id: If923db4ff67f72158fcdf7c002eda38c9cdeb786 diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is the lcl_LocalFunction naming convention useful?
On 10/09/2012 01:59 AM, Tor Lillqvist wrote: Where did this lcl_ convention come from? The lcl_ prefix has no meaning to a compiler or linker. If the intent is to make such functions file-local, why not use the static keyword, or an anonymous namespace instead, so that they actually *are* local also to the tool-chain? (You can still keep the lcl_ prefix if you love it.) For the record, I hate this convention and I purposefully don't follow it myself. It just looks ugly. That's all my reason against it. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/view/output.cxx | 30 ++
1 file changed, 26 insertions(+), 4 deletions(-)
New commits:
commit a551cad4e35b6b664167d65dfc25e5a0f6990687
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 11:07:13 2012 -0400
Always disable anti-aliasing for drawing cell borders.
It looks better that way that's the way it was before.
Change-Id: Iedb5234f4b032d4362f91f811bb9131824267704
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 1922a08..24b4fca 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -33,6 +33,7 @@
#include editeng/brshitem.hxx
#include editeng/editdata.hxx
#include svtools/colorcfg.hxx
+#include svtools/optionsdrawinglayer.hxx
#include svx/rotmodit.hxx
#include editeng/shaditem.hxx
#include editeng/svxfont.hxx
@@ -1237,10 +1238,7 @@ void ScOutputData::DrawClear()
}
}
-
-//
-// Linien
-//
+namespace {
long lclGetSnappedX( OutputDevice rDev, long nPosX, bool bSnapPixel )
{
@@ -1257,8 +1255,32 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16
nCellInfoX, sal_uInt16 nCellInfoF
return static_cast size_t ( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) :
(nCellInfoX - nCellInfoFirstX) );
}
+/**
+ * Temporarily turn off antialiasing.
+ */
+class AntiAliasingSwitch
+{
+SvtOptionsDrawinglayer maDrawOpt;
+bool mbOldSetting;
+public:
+AntiAliasingSwitch(bool bOn) : mbOldSetting(maDrawOpt.IsAntiAliasing())
+{
+maDrawOpt.SetAntiAliasing(bOn);
+}
+
+~AntiAliasingSwitch()
+{
+maDrawOpt.SetAntiAliasing(mbOldSetting);
+}
+};
+
+}
+
void ScOutputData::DrawFrame()
{
+// No anti-aliasing for drawing cell borders.
+AntiAliasingSwitch aAASwitch(false);
+
sal_uLong nOldDrawMode = mpDev-GetDrawMode();
Color aSingleColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Introducing compiler plugin support
On Tuesday 09 of October 2012, Lubos Lunak wrote: On Friday 05 of October 2012, Lubos Lunak wrote: Hello, attached is my implementation of basic build support for using Clang compiler plugin during building LO. I'm posting it here first in case our build system people have different ideas to how I have integrated it in the build system, if there are no comments, I will push it. Pushed. There is a README included, but some highlights: One thing I forgot: If you use this together with ccache, you need ccache git checkout (specifically [1], not even 3.1.8 is new enough), otherwise ccache will misinterpret '-Xclang loplugin' as a second source file to compile and will not cache anything. For those using packages from home:llunak:ccache in OBS, you need to update too. [1] http://gitweb.samba.org/?p=ccache.git;a=blobdiff;f=compopt.c;h=77b57f592b13f0c3cf8216ad2760ade421d0cb44;hp=35d51ad43d5e5a94ccf0d8a6c4e9ddaedccab631;hb=8e005b067d8c2423e24ee14ffdee8343f650f1e8;hpb=806b511643ec830f50d6d6975b2ecfd1876a6f17 -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2/helpers helpcontent2/source
helpcontent2/helpers/help_hid.lst |7 -- helpcontent2/source/text/shared/01/04150100.xhp | 25 +++- 2 files changed, 12 insertions(+), 20 deletions(-) New commits: commit 3dc2e7497f1798ae4ff6c5c8c562666bc10a393c Author: Caolán McNamara caol...@redhat.com Date: Fri Oct 12 16:34:54 2012 +0100 convert insert-object-ole object to .ui helpids Change-Id: I90762f1ccf37ee1a444d127aad868cdd0a3cc547 diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst index 2be3dbd..e2c99ed 100644 --- a/helpcontent2/helpers/help_hid.lst +++ b/helpcontent2/helpers/help_hid.lst @@ -7802,7 +7802,6 @@ svx_CB_USE_VARIANTS_DLG_CHINESETRANSLATION,1078657024, svx_CheckBox_DLG_CHINESETRANSLATION_CB_TRANSLATE_COMMONTERMS,1078658050, svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINHEIGHTDEFAULT,1598211094, svx_CheckBox_MD_INSERT_OBJECT_IFRAME_CB_MARGINWIDTHDEFAULT,1598211093, -svx_CheckBox_MD_INSERT_OLEOBJECT_CB_FILELINK,1598194700, svx_CheckBox_MD_PASTE_OBJECT_CB_DISPLAY_AS_ICON,1598047244, svx_CheckBox_OFA_TP_LANGUAGES_CB_ASIANSUPPORT,81059, svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671, @@ -8020,7 +8019,6 @@ svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSFILE,1598179339, svx_Edit_MD_INSERT_OBJECT_APPLET_ED_CLASSLOCATION,1598179340, svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_FRAMENAME,1598212100, svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL,1598212102, -svx_Edit_MD_INSERT_OLEOBJECT_ED_FILEPATH,1598195722, svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_MD_NEW_TOOLBAR_EDT_STRING,1080314258, @@ -8212,7 +8210,6 @@ svx_ImageButton_RID_SVXPAGE_TEXTANIMATION_BTN_UP,703737345, svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_HORZ,1238295050, svx_ImageRadioButton_RID_SVX_SPLITCELLDLG_RB_VERT,1238295052, svx_ListBox_DLG_CHINESEDICTIONARY_LB_PROPERTY,1078676993, -svx_ListBox_MD_INSERT_OLEOBJECT_LB_OBJECTTYPE,1598197260, svx_ListBox_MD_NEW_TOOLBAR_LB_SAVEIN,1080315716, svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST,1598049799, svx_ListBox_OFA_TP_LANGUAGES_LB_ASIAN_LANG,810569224, @@ -8535,7 +8532,6 @@ svx_ModalDialog_DLG_INS_ROW_COL,1240137728, svx_ModalDialog_MD_ICONCHANGE,1080606720, svx_ModalDialog_MD_INSERT_OBJECT_APPLET,1598177280, svx_ModalDialog_MD_INSERT_OBJECT_IFRAME,1598210048, -svx_ModalDialog_MD_INSERT_OLEOBJECT,1598193664, svx_ModalDialog_MD_LINKEDIT,1598095360, svx_ModalDialog_MD_NEW_TOOLBAR,1080311808, svx_ModalDialog_MD_PASTE_OBJECT,1598046208, @@ -8630,7 +8626,6 @@ svx_PushButton_MD_ICONSELECTOR_BTN_DELETE,1080136601, svx_PushButton_MD_ICONSELECTOR_BTN_IMPORT,1080136589, svx_PushButton_MD_INSERT_OBJECT_APPLET_BTN_CLASS,1598181901, svx_PushButton_MD_INSERT_OBJECT_IFRAME_BT_FILEOPEN,1598214663, -svx_PushButton_MD_INSERT_OLEOBJECT_BTN_FILEPATH,1598198283, svx_PushButton_MD_PASTE_OBJECT_PB_CHANGE_ICON,1598050830, svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238, svx_PushButton_MD_UPDATE_BASELINKS_PB_CHANGE_SOURCE,1598067237, @@ -8809,8 +8804,6 @@ svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_FRMBORDER_ON,1598210578, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGAUTO,1598210575, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGOFF,1598210574, svx_RadioButton_MD_INSERT_OBJECT_IFRAME_RB_SCROLLINGON,1598210573, -svx_RadioButton_MD_INSERT_OLEOBJECT_RB_NEW_OBJECT,1598194186, -svx_RadioButton_MD_INSERT_OLEOBJECT_RB_OBJECT_FROMFILE,1598194187, svx_RadioButton_MD_PASTE_OBJECT_RB_PASTE,1598046740, svx_RadioButton_MD_PASTE_OBJECT_RB_PASTE_LINK,1598046741, svx_RadioButton_MD_UPDATE_BASELINKS_RB_AUTOMATIC,1598063146, diff --git a/helpcontent2/source/text/shared/01/04150100.xhp b/helpcontent2/source/text/shared/01/04150100.xhp index cce7be2..fc9f9ef 100644 --- a/helpcontent2/source/text/shared/01/04150100.xhp +++ b/helpcontent2/source/text/shared/01/04150100.xhp @@ -44,8 +44,7 @@ bookmark_valueinserting; OLE objects/bookmark_value bookmark_valueobjects; inserting OLE objects/bookmark_value /bookmark -!-- removed HID SO3:MODALDIALOG:MD_INSERT_OLEOBJECT -- -bookmark xml-lang=en-US branch=hid/.uno:InsertObject id=bm_id9083923 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/insertoleobject/InsertOLEObjectDialog id=bm_id9083923 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:InsertObject id=bm_id3152952 localize=false/paragraph role=heading id=hd_id3153116 xml-lang=en-US level=1 l10n=U oldref=1Insert OLE Object/paragraph paragraph role=paragraph id=par_id3149748 xml-lang=en-US l10n=U oldref=2variable id=oleahelp hid=.uno:InsertObjectInserts an link href=text/shared/00/0005.xhp#ole name=OLEOLE/link object into the current document. The OLE object is inserted as a link or an embedded object./ahelp /variable/paragraph @@ -55,19 +54,19 @@ paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=U oldref=19To speed up the display of the document, OLE objects are kept in the program cache. If you want to change the
[Libreoffice-commits] .: framework/source
framework/source/jobs/job.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 46a418af78d066db75999282ea255583e686380e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 16:41:38 2012 +0100
loplugin: bad else if placement
Change-Id: I56e88a675adf37fdf52637ecbff6778a5215a16a
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 7d7b631..cc881a4 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -898,14 +898,12 @@ void SAL_CALL Job::disposing( const
css::lang::EventObject aEvent ) throw(css::
m_xDesktop = css::uno::Reference css::frame::XDesktop ();
m_bListenOnDesktop = sal_False;
}
-else
-if (m_xFrame.is() aEvent.Source == m_xFrame)
+else if (m_xFrame.is() aEvent.Source == m_xFrame)
{
m_xFrame = css::uno::Reference css::frame::XFrame ();
m_bListenOnFrame = sal_False;
}
-else
-if (m_xModel.is() aEvent.Source == m_xModel)
+else if (m_xModel.is() aEvent.Source == m_xModel)
{
m_xModel = css::uno::Reference css::frame::XModel ();
m_bListenOnModel = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit fa694a21b806ed7837c1337ec49a4b299c478393
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Oct 12 17:41:49 2012 +0200
fdo#55931 Fix renderding of subscript/superscript with Autofit Text.
We are using font metrics to compute the stretch ratio for autofit; but that
collides with nPropr property of SvxFont - it is then counted twice, ie. in
the case of nPropr == 25, we actually behave as if it was much less; and
worse, only in the horizontal direction.
Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5878822..2e00179 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2651,10 +2651,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode,
sal_uInt16 nPos, SvxFont rF
// ugly on the screen!
OutputDevice* pDev = pOut ? pOut : GetRefDevice();
rFont.SetPhysFont( pDev );
-FontMetric aMetric( pDev-GetFontMetric() );
-// For the height do not consider the metrics, because it will go
-// wrong at Superscript/Subscript.
-Size aRealSz( aMetric.GetSize().Width(), rFont.GetSize().Height() );
+Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
if ( aStatus.DoStretch() )
{
if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk |2 +- binfilter/bf_svtools/util/makefile.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4781be1277dfb218b66fb787e5ec9a2ed7d9011d Author: David Ostrovsky da...@ostrovsky.org Date: Fri Oct 12 08:50:07 2012 -0700 rename jpeg_filter to prevent the hiding of global jpeg library Change-Id: I7bef1a2976a8305f8ad7d9a086b3621e9f709e93 Reviewed-on: https://gerrit.libreoffice.org/861 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk index 4d3a3fb..affbbd6 100644 --- a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk +++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk @@ -19,7 +19,7 @@ PRJ=..$/..$/..$/.. PRJNAME=binfilter -TARGET=jpeg +TARGET=jpeg_filter # --- Settings --- diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk index 05488e3..fc1059c 100644 --- a/binfilter/bf_svtools/util/makefile.mk +++ b/binfilter/bf_svtools/util/makefile.mk @@ -41,7 +41,7 @@ LIB1FILES=\ $(SLB)$/unoiface.lib \ $(SLB)$/filter.lib \ $(SLB)$/igif.lib \ -$(SLB)$/jpeg.lib \ +$(SLB)$/jpeg_filter.lib\ $(SLB)$/ixpm.lib \ $(SLB)$/ixbm.lib \ $(SLB)$/numbers.lib\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] fdo#55931 Fix renderding of subscript/superscript with Autofit Text.
Hi Thorsten, Can you please check http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa694a21b806ed7837c1337ec49a4b299c478393 and approve it for 3.6? A test presentation is attached to the bugreport; when the autofit is on, the subscript is not readable, when you switch it off, it appears. The reason is that we are using font metrics to compute the stretch ratio for autofit; but that collides with nPropr property of SvxFont - it is then counted twice, ie. in the case of nPropr == 25, we actually behave as if it was much less; and worse, only in the horizontal direction. Thank you a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/doc/dbgoutsw.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20c0339311df0a14229c2786ecf6440bd8c1fd61
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 12 17:00:44 2012 +0100
WaE: SW_DLLPUBLIC on static function doesn't make sense
Change-Id: I9a7881d0e114dc38a6cb461b04e971ae23da9543
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 334ee88..8ccb8e8 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -284,7 +284,7 @@ SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem)
String((nil), RTL_TEXTENCODING_ASCII_US));
}
-SW_DLLPUBLIC static const String lcl_dbg_out(const SfxItemSet rSet)
+static const String lcl_dbg_out(const SfxItemSet rSet)
{
SfxItemIter aIter(rSet);
const SfxPoolItem * pItem;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 16 ++--
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit a010c4eaea6d6c45621a11d035f76266b0a5147c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 11 12:20:07 2012 +0100
Resolves: fdo#48569 crash on export to .docx of inline anchored frame
we're currently deferring to the end of the text node to export
the contents of frames. If its anchored as character then the
sw::Frame (which is allocated on stack) has gone out of scope
so this pointer points to junk. Copy it instead.
Sill need to export frames property at some stage.
Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad
(cherry picked from commit 60a93729c95d31edab50a905236faa9e38a81556)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 179c2f6..7149e49 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -311,7 +311,10 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// Write the anchored frame if any
if ( m_pParentFrame )
{
-const SwFrmFmt rFrmFmt = m_pParentFrame-GetFrmFmt( );
+sw::Frame *pParentFrame = m_pParentFrame;
+m_pParentFrame = NULL;
+
+const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( );
const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
sal_uLong nStt = pNodeIndex ? pNodeIndex-GetIndex()+1
: 0;
@@ -319,12 +322,13 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
m_rExport.SaveData( nStt, nEnd );
-m_rExport.mpParentFrame = m_pParentFrame;
-m_pParentFrame = NULL;
+m_rExport.mpParentFrame = pParentFrame;
m_rExport.WriteText( );
m_rExport.RestoreData();
+
+delete pParentFrame;
}
}
@@ -2396,8 +2400,8 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const
sw::Frame rFrame, const Po
break;
case sw::Frame::eTxtBox:
{
-// The frame output is postponed at the end of the anchor
paragraph
-m_pParentFrame = rFrame;
+// The frame output is postponed to the end of the anchor
paragraph
+m_pParentFrame = new sw::Frame(rFrame);
}
break;
case sw::Frame::eOle:
@@ -4455,7 +4459,7 @@ DocxAttributeOutput::~DocxAttributeOutput()
delete m_pEndnotesList, m_pEndnotesList = NULL;
delete m_pTableWrt, m_pTableWrt = NULL;
-m_pParentFrame = NULL;
+delete m_pParentFrame;
}
DocxExport DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 4caf047..0d176e1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -587,7 +587,7 @@ private:
// beginning of the next paragraph
DocxColBreakStatus m_nColBreakStatus;
-const sw::Frame *m_pParentFrame;
+sw::Frame *m_pParentFrame;
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 16 ++--
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 1f865ac8e35326b01c9f3cb96fea313b53eb812b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 11 12:20:07 2012 +0100
Resolves: fdo#48569 crash on export to .docx of inline anchored frame
we're currently deferring to the end of the text node to export
the contents of frames. If its anchored as character then the
sw::Frame (which is allocated on stack) has gone out of scope
so this pointer points to junk. Copy it instead.
Sill need to export frames property at some stage.
Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad
(cherry picked from commit 60a93729c95d31edab50a905236faa9e38a81556)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 100a1e1..24dee9a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -310,7 +310,10 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// Write the anchored frame if any
if ( m_pParentFrame )
{
-const SwFrmFmt rFrmFmt = m_pParentFrame-GetFrmFmt( );
+sw::Frame *pParentFrame = m_pParentFrame;
+m_pParentFrame = NULL;
+
+const SwFrmFmt rFrmFmt = pParentFrame-GetFrmFmt( );
const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx();
sal_uLong nStt = pNodeIndex ? pNodeIndex-GetIndex()+1
: 0;
@@ -318,12 +321,13 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
m_rExport.SaveData( nStt, nEnd );
-m_rExport.mpParentFrame = m_pParentFrame;
-m_pParentFrame = NULL;
+m_rExport.mpParentFrame = pParentFrame;
m_rExport.WriteText( );
m_rExport.RestoreData();
+
+delete pParentFrame;
}
}
@@ -2381,8 +2385,8 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const
sw::Frame rFrame, const Po
break;
case sw::Frame::eTxtBox:
{
-// The frame output is postponed at the end of the anchor
paragraph
-m_pParentFrame = rFrame;
+// The frame output is postponed to the end of the anchor
paragraph
+m_pParentFrame = new sw::Frame(rFrame);
}
break;
case sw::Frame::eOle:
@@ -4380,7 +4384,7 @@ DocxAttributeOutput::~DocxAttributeOutput()
delete m_pEndnotesList, m_pEndnotesList = NULL;
delete m_pTableWrt, m_pTableWrt = NULL;
-m_pParentFrame = NULL;
+delete m_pParentFrame;
}
DocxExport DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 4d1b5a6..4dbe486 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -586,7 +586,7 @@ private:
// beginning of the next paragraph
DocxColBreakStatus m_nColBreakStatus;
-const sw::Frame *m_pParentFrame;
+sw::Frame *m_pParentFrame;
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - avmedia/source solenv/bin
avmedia/source/gstreamer/gstframegrabber.hxx |2
solenv/bin/concat-deps.c | 124 +++
2 files changed, 109 insertions(+), 17 deletions(-)
New commits:
commit d0bf1510632801e15f1f498320c90efb6d773d6e
Author: Michael Meeks michael.me...@suse.com
Date: Thu Oct 11 19:14:39 2012 +0100
detect and collapse internal boost dependencies to a single header
Change-Id: I18281f9cdf4c20ab4f939b2f7d3b0a6c3bf5387b
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 11571ee..81a4792 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -109,9 +109,9 @@
#define FALSE 0
#endif
-static char* base_dir_var = $(SRCDIR);
-#define kBASE_DIR_VAR_LENGTH 9
+int internal_boost = 0;
static char* base_dir;
+static char* out_dir;
#ifdef __GNUC__
#define clz __builtin_clz
@@ -711,15 +711,23 @@ static inline void eat_space(char ** token)
}
/*
+ * Find substring in bounded length string
+ */
+static inline const char *find_substr(const char *key, int key_len,
+ const char *substr, int substr_len)
+{
+}
+
+/*
* Prune LibreOffice specific duplicate dependencies to improve
* gnumake startup time, and shrink the disk-space footprint.
*/
-static inline int elide_dependency(const char* key, int key_len)
+static inline int elide_dependency(const char* key, int key_len, int
*boost_count)
{
#if 0
{
int i;
-fprintf (stderr, elide?!: ');
+fprintf (stderr, elide?%d!: ', internal_boost);
for (i = 0; i key_len; i++) {
fprintf (stderr, %c, key[i]);
}
@@ -730,14 +738,48 @@ static inline int elide_dependency(const char* key, int
key_len)
/* .hdl files are always matched by .hpp */
if (key_len 4 !strncmp(key + key_len - 4, .hdl, 4))
return 1;
+
+/* boost brings a plague of header files */
+if (internal_boost)
+{
+int i;
+int hit = 0;
+/* walk down path elements */
+for (i = 0; i key_len - 1; i++)
+{
+if (key[i] == '/')
+{
+if (!strncmp(key + i + 1, solver/, 7))
+hit++;
+if (hit 0 !strncmp(key + i + 1, inc/external/boost/,
19))
+{
+if (boost_count)
+(*boost_count)++;
+return 1;
+}
+}
+}
+}
+
return 0;
}
+/*
+ * We collapse tens of internal boost headers to a single one, such
+ * that you can re-compile / install boost and all is well.
+ */
+static void emit_single_boost_header(void)
+{
+#define BOOST_HEADER /inc/external/boost/bind.hpp
+fprintf(stdout, %s BOOST_HEADER , out_dir);
+}
+
/* prefix paths to absolute */
static inline void print_fullpaths(char* line)
{
char* token;
char* end;
+int boost_count = 0;
token = line;
eat_space(token);
@@ -748,18 +790,30 @@ static inline void print_fullpaths(char* line)
++end;
}
int token_len = end - token;
-if(elide_dependency(token, token_len))
-; /* don't output it */
+if(elide_dependency(token, token_len, boost_count))
+{
+if (boost_count == 1)
+emit_single_boost_header();
+else
+{
+/* don't output, and swallow trailing \\\n if any */
+token = end;
+eat_space(token);
+if (token[0] == '\\' token[1] == '\n')
+end = token + 2;
+}
+}
else if(*token == ':' || *token == '\\' || *token == '/' ||
*token == '$' || ':' == token[1])
{
fwrite(token, token_len, 1, stdout);
+fputc(' ', stdout);
}
else
{
fwrite(token, end - token, 1, stdout);
+fputc(' ', stdout);
}
-fputc(' ', stdout);
token = end;
eat_space(token);
}
@@ -821,7 +875,7 @@ off_t size;
* duplicate out
*/
int key_len = cursor_out - base;
-if(!elide_dependency(base,key_len - 1)
+if(!elide_dependency(base,key_len - 1, NULL)
hash_store(dep_hash, base, key_len))
{
/* DO NOT modify base after it has been added
@@ -887,6 +941,17 @@ static void _usage(void)
#define kDEFAULT_HASH_SIZE 4096
+static int get_var(char **var, const char *name)
+{
+*var = (char *)getenv(name);
+if(!*var)
+{
+fprintf(stderr,Error: %s is missing in the environement\n, name);
+return 1;
+}
+return 0;
+}
+
int main(int argc, char** argv)
{
int rc = 0;
@@ -895,18 +960,18 @@ char* in_list;
char* in_list_cursor;
char*
Re: [PUSHED 3-5][PUSHED 3-6] fdo#48569 crash on export to .docx of frame anchored as character
Hi Caolán, On Thursday, 2012-10-11 12:29:19 +0100, Caolán McNamara wrote: We're taking a pointer to something on the stack, in the as-character case, its been destroyed before we use it. So simply copy the titchy frame-export helper instead http://cgit.freedesktop.org/libreoffice/core/commit/?id=60a93729c95d31edab50a905236faa9e38a81556 Pushed with my sign-off http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=a010c4eaea6d6c45621a11d035f76266b0a5147c http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=1f865ac8e35326b01c9f3cb96fea313b53eb812b Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp48BwZCT7JT.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove not used acros form sd
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/863 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/863/1 Remove not used acros form sd Change-Id: Idb4b029fd9c11cdd8373490b6cfd6ca4fb4b43a0 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M sd/source/core/typemap.cxx M sd/source/filter/cgm/sdcgmfilter.cxx M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/epptso.cxx M sd/source/filter/html/htmlex.cxx M sd/source/ui/dlg/RemoteDialogClientBox.cxx M sd/source/ui/func/fulinend.cxx 7 files changed, 0 insertions(+), 82 deletions(-) -- To view, visit https://gerrit.libreoffice.org/863 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb4b029fd9c11cdd8373490b6cfd6ca4fb4b43a0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove not used macros from connectivity
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/862 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/862/1 Remove not used macros from connectivity Change-Id: I31265a76046526352d1c1897aac87f7c87687cf5 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M connectivity/source/drivers/file/FResultSet.cxx M connectivity/source/drivers/jdbc/ResultSetMetaData.cxx M connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx M connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx 4 files changed, 0 insertions(+), 9 deletions(-) -- To view, visit https://gerrit.libreoffice.org/862 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31265a76046526352d1c1897aac87f7c87687cf5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit cc4568e57649367d3d611ce0732d86ee8b829d3c
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Oct 12 20:37:23 2012 +0200
WaE -Wunused-function
Change-Id: I201ee3b1092fce188d2bbc90aeb93059b175a03e
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 2721e5c..a0f40cc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1362,13 +1362,6 @@ static long lcl_MinHeightDist( const long nDist )
return ::lcl_AlignHeight( Max( nDist, nMinDistPixelH ));
}
-static long lcl_MinWidthDist( const long nDist )
-{
-if ( aScaleX aMinDistScale || aScaleY aMinDistScale )
-return nDist;
-return ::lcl_AlignWidth( Max( nDist, nMinDistPixelW ));
-}
-
//Calculate PrtArea plus surrounding plus shadow.
static void lcl_CalcBorderRect( SwRect rRect, const SwFrm *pFrm,
const SwBorderAttrs rAttrs,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Added stream sanity checking to TGA filter
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/864 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/864/1 Added stream sanity checking to TGA filter Change-Id: If6bb9f28e76ea012ac46b74e3cea0e27fd86741e --- M filter/source/graphicfilter/itga/itga.cxx 1 file changed, 63 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/864 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6bb9f28e76ea012ac46b74e3cea0e27fd86741e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marc-André Laverdière marc-an...@atc.tcs.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xiescher.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 15:25:20 2012 -0400
Check for null object. The OLE name may not always be set.
Change-Id: Ib3e55af8870b41a5b76179d2215fc5125ceda5af
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 54f0337..d76b379 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3200,7 +3200,7 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB
nTab, sal_uInt16 nObjId )
rtl::OUString sOleName;
String sCodeName = GetExtDocOptions().GetCodeName( nTab );
-if ( mxOleCtrlNameOverride-hasByName( sCodeName ) )
+if (mxOleCtrlNameOverride.is()
mxOleCtrlNameOverride-hasByName(sCodeName))
{
Reference XIndexContainer xIdToOleName;
mxOleCtrlNameOverride-getByName( sCodeName ) = xIdToOleName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] Simple missing null object check to fix crasher.
Hi there, I'd like to get this http://cgit.freedesktop.org/libreoffice/core/commit/?id=fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10 backported to the 3-6 branch. Without this check, importing the following document http://www.bedrunecka.cz/epd/3_naklady_a_kalkulace.ppt will crash soffice. I think the change is simple enough to be backported safely. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 2 commits - sc/inc sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk|1
sc/inc/orcusfilters.hxx |4 +-
sc/inc/orcusxml.hxx | 47 +
sc/source/filter/inc/orcusfiltersimpl.hxx |3 -
sc/source/filter/orcus/orcusfiltersimpl.cxx | 51
sc/source/filter/orcus/orcusxml.cxx | 15
sc/source/ui/inc/xmlsourcedlg.hxx |6 +--
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 10 ++---
8 files changed, 112 insertions(+), 25 deletions(-)
New commits:
commit b259bba4637795c52b3d4b3a0201236567057bcc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 17:20:52 2012 -0400
Set user data to each tree entry.
Change-Id: I708bbbae7696a66f7acae8a8d01c98a3c81d32e8
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 7a5256e..8809028 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -219,6 +219,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/worksheethelper \
sc/source/filter/oox/worksheetsettings \
sc/source/filter/orcus/orcusfiltersimpl \
+sc/source/filter/orcus/orcusxml \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 506e822..019441c 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -28,7 +28,7 @@ public:
virtual bool importCSV(ScDocument rDoc, const rtl::OUString rPath) const
= 0;
virtual bool loadXMLStructure(
- SvTreeListBox rTreeCtrl, const rtl::OUString rPath,
ScOrcusXMLTreeParam rParam) const = 0;
+ const rtl::OUString rPath, SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const = 0;
};
#endif
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index dfb2867..cdc4679 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -25,6 +25,8 @@ struct ScOrcusXMLTreeParam
struct TreeEntryUserData
{
EntryType meType;
+
+TreeEntryUserData(EntryType eType);
};
typedef boost::ptr_vectorTreeEntryUserData UserDataStoreType;
diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx
b/sc/source/filter/inc/orcusfiltersimpl.hxx
index 29562c2..956e940 100644
--- a/sc/source/filter/inc/orcusfiltersimpl.hxx
+++ b/sc/source/filter/inc/orcusfiltersimpl.hxx
@@ -18,7 +18,7 @@ public:
virtual bool importCSV(ScDocument rDoc, const rtl::OUString rPath) const;
virtual bool loadXMLStructure(
-SvTreeListBox rTreeCtrl, const rtl::OUString rPath,
ScOrcusXMLTreeParam rParam) const;
+const rtl::OUString rPath, SvTreeListBox rTreeCtrl,
ScOrcusXMLTreeParam rParam) const;
};
#endif
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 3e9bca0..c5b8711 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -176,6 +176,13 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument rDoc, const
OUString rPath) cons
namespace {
+void setUserDataToEntry(
+SvLBoxEntry rEntry, ScOrcusXMLTreeParam::UserDataStoreType rStore,
ScOrcusXMLTreeParam::EntryType eType)
+{
+rStore.push_back(new ScOrcusXMLTreeParam::TreeEntryUserData(eType));
+rEntry.SetUserData(rStore.back());
+}
+
void populateTree(
SvTreeListBox rTreeCtrl, orcus::xml_structure_tree::walker rWalker,
const orcus::xml_structure_tree::entity_name rElemName, bool bRepeat,
@@ -183,8 +190,17 @@ void populateTree(
{
OUString aName(rElemName.name.get(), rElemName.name.size(),
RTL_TEXTENCODING_UTF8);
SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
+if (!pEntry)
+// Can this ever happen!?
+return;
+
+setUserDataToEntry(
+*pEntry, rParam.maUserDataStore,
+bRepeat ? ScOrcusXMLTreeParam::ElementRepeat :
ScOrcusXMLTreeParam::ElementDefault);
+
if (bRepeat)
{
+// Recurring elements use different icon.
rTreeCtrl.SetExpandedEntryBmp(pEntry, rParam.maImgElementRepeat);
rTreeCtrl.SetCollapsedEntryBmp(pEntry, rParam.maImgElementRepeat);
}
@@ -194,13 +210,20 @@ void populateTree(
orcus::xml_structure_tree::entity_names_type aNames;
+// Insert attributes.
rWalker.get_attributes(aNames);
orcus::xml_structure_tree::entity_names_type::const_iterator it =
aNames.begin();
orcus::xml_structure_tree::entity_names_type::const_iterator itEnd =
aNames.end();
for (; it != itEnd; ++it)
{
orcus::xml_structure_tree::entity_name aAttrName = *it;
-SvLBoxEntry* pAttr =
rTreeCtrl.InsertEntry(OUString(aAttrName.name.get(), aAttrName.name.size(),
RTL_TEXTENCODING_UTF8), pEntry);
+SvLBoxEntry* pAttr = rTreeCtrl.InsertEntry(
+OUString(aAttrName.name.get(), aAttrName.name.size(),
RTL_TEXTENCODING_UTF8), pEntry);
+
+if (!pAttr)
+continue;
+
+setUserDataToEntry(*pAttr, rParam.maUserDataStore,
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/source
sc/source/ui/inc/xmlsourcedlg.hrc |9 +
sc/source/ui/inc/xmlsourcedlg.hxx |1 +
sc/source/ui/src/xmlsourcedlg.src | 12
sc/source/ui/xmlsource/xmlsourcedlg.cxx |4 ++--
4 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 48225f78ca36ae6dd9b14ae5088a1ebfe257e32a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 17:30:20 2012 -0400
Display selected tree item name on the dialog when clicked on.
Change-Id: If7f7d938f4eacfc921a1e591fa4e59c5c9cf127e
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc
b/sc/source/ui/inc/xmlsourcedlg.hrc
index 67cf9b8..03cb645 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hrc
+++ b/sc/source/ui/inc/xmlsourcedlg.hrc
@@ -17,10 +17,11 @@
#define FT_SOURCE_FILE 12
#define FL_MAP_XML_TO_DOCUMENT 20
-#define FT_MAPPED_CELL_TITLE 21
-#define ED_MAPPED_CELL 22
-#define BTN_MAPPED_CELL 23
-#define LB_SOURCE_TREE 24
+#define FT_TREE_ITEM_NAME 21
+#define FT_MAPPED_CELL_TITLE 22
+#define ED_MAPPED_CELL 23
+#define BTN_MAPPED_CELL 24
+#define LB_SOURCE_TREE 25
#define IMG_ELEMENT_DEFAULT 50
#define IMG_ELEMENT_REPEAT 51
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 75d698f..f946fb2 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -37,6 +37,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg
FixedLine maFtMapXmlDoc;
+FixedText maFtTreeItemName;
FixedText maFtMappedCellTitle;
formula::RefEdit maEdit;
formula::RefButton maBtnRb;
diff --git a/sc/source/ui/src/xmlsourcedlg.src
b/sc/source/ui/src/xmlsourcedlg.src
index 4119601..342d47a 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -48,25 +48,29 @@ ModelessDialog RID_SCDLG_XML_SOURCE
Text [ en-US ] = Map to document;
};
-FixedText FT_MAPPED_CELL_TITLE
+FixedText FT_TREE_ITEM_NAME
{
Pos = MAP_APPFONT( 12, 52 );
Size = MAP_APPFONT ( 100 , 8 ) ;
+};
-Text [ en-US ] = ;
+FixedText FT_MAPPED_CELL_TITLE
+{
+Pos = MAP_APPFONT( 12, 67 );
+Size = MAP_APPFONT ( 100 , 8 ) ;
};
Edit ED_MAPPED_CELL
{
Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 66 ) ;
+Pos = MAP_APPFONT ( 12 , 81 ) ;
Size = MAP_APPFONT ( 69 , 12 ) ;
TabStop = TRUE ;
};
ImageButton BTN_MAPPED_CELL
{
-Pos = MAP_APPFONT ( 83 , 65 ) ;
+Pos = MAP_APPFONT ( 83 , 80 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = Shrink ;
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 1b9f213..6071f82 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -36,6 +36,7 @@ ScXMLSourceDlg::ScXMLSourceDlg(
maBtnSelectSource(this, ScResId(BTN_SELECT_SOURCE_FILE)),
maFtSourceFile(this, ScResId(FT_SOURCE_FILE)),
maFtMapXmlDoc(this, ScResId(FL_MAP_XML_TO_DOCUMENT)),
+maFtTreeItemName(this, ScResId(FT_TREE_ITEM_NAME)),
maFtMappedCellTitle(this, ScResId(FT_MAPPED_CELL_TITLE)),
maEdit(this, this, ScResId(ED_MAPPED_CELL)),
maBtnRb(this, ScResId(BTN_MAPPED_CELL), maEdit, this),
@@ -186,8 +187,7 @@ void ScXMLSourceDlg::TreeItemSelected()
{
SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
OUString aName = maLbTree.GetEntryText(pEntry);
-fprintf(stdout, ScXMLSourceDlg::TreeItemSelected: name = '%s'\n,
-rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
+maFtTreeItemName.SetText(aName);
}
IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit dcaf8a871c3ce47e4b51b5c026e47d1ad03f5696
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Oct 12 23:29:59 2012 +0200
uninit variable
Change-Id: I94870693fc269ab7a40e9ded482d259921316c38
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index c9c5857..5e0a67a 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -79,7 +79,8 @@ struct lcl_ApplyCellToData : public ::std::unary_function
SchXMLCell, void
lcl_ApplyCellToData( Sequence double rOutData ) :
m_rData( rOutData ),
m_nIndex( 0 ),
-m_nSize( rOutData.getLength())
+m_nSize( rOutData.getLength()),
+m_fNaN( 0.0 )
{
::rtl::math::setNan( m_fNaN );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxslt/makefile.mk
libxslt/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c25269446f80e4333fdefa6e96151757a74d894c Author: Julien Nabet serval2...@yahoo.fr Date: Fri Oct 12 23:53:38 2012 +0200 Even if it shouldn't be a pb, let's do the same everywhere Change-Id: I5775651a83ffa6a7780b81386168f4e327217282 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 88f7761..1ff05d6 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -153,7 +153,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .IF $(OS) == MACOSX CONFIGURE_FLAGS += \ --prefix=/@.__$(EXTRPATH) -.END +.ENDIF BUILD_ACTION=chmod 777 xslt-config $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the ESC call 2012-10-11
Attending: Joel, Fridrich, Thorsten, Eike, Andras, Caolan, Kendy, David, Mirek, Kohei, Cedric, Rodo, Andras, Astron, Michael S. * Completed Action Items + Petr to decide release-schedule / overlap gap issue + done/expired + mail thb/sweetshark for a cheap Berlin / hotel room + done + push distro/suse/suse-3.6 branch (Andras) + done * Pending Action Items + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + [in progress] enable automatic help build / sync. on a cron-job (Kendy) + script written, deploy it + issues to look into if we can + fdo#34548 - review Michael's patch (Thorsten) + fdo#55290 - master doesn't install on windows (dtardon) + fdo#55360 - mac specific text issue (Thorsten) + fdo#51023 - impress DD crasher - (Radek) + ping Tollef wrt. sysadmin work (Bjoern) * Release Engineering update (Petr) + vacation / quality report (deferred) + should we enable on-line updates to 3.6.2 ? + fdo#55560 / fdo#52022 needs fixing before general update + upgrade 3.5.0-3.5.1 to 3.6.2 though, those versions are clearly inferior. + 3.5.7 status + 3.5.7 rc2 built (fixes docx crasher), due next week + 3.6.3 rc1 status + builds running, mirror push tomorrow + rc2 22nd of october (fdo#55560 needs fixing!) * UI / design update (Astron) + gtk3 prototype + interesting food for thought + icons for new conditional formats in cells ... (pending) + no chat this week, handling happens on the list * conference (Thorsten) + in-person ESC meeting 16th October, 17:00 local time at the venue. * QA update (Joel) + HardHack list moved to wiki - http://wiki.documentfoundation.org/HardHacks - updates / assignments appreciated there + 3.5 MAB needs cherry-picking and folding into 3.6 MAB (some don't seem to be valid most annoying) + some thoughts around another 3.5 release * Open 3.7 MAB / regressions [ there should be none ]: + fdo#55290 - LOdev 3.7 won't install [ on Windows ]. Error 1935 (dtardon) + fdo#55560 - CRASH when Format Cells (menu and Context menu) (Fridrich/Kohei) + fdo#55570 - significant autocorrect slow-down (Stephan) + fdo#55685 - CRASH when create or modify Character Style or Paragraph Style (fixed by Caolan) + https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1 * Open HardHacks + fdo#50285 - Saving document as .doc introduces bogus superscript text * 3.6 most annoying bugs ... + 27 (of 127) older 44/139 46/137 45/132 44/127 39/119 27/96 26/91 21/80 11/58 21%32%34%34%35% 33% 28% 29% 26% 19% + https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1 * 3.5 most annoying bugs ... + 78 open (of 278) older 81/279 82/279 83/279 80/270 81/269 73/258 73/257 28% 29%29%30%30%30%26%28% + https://bugs.freedesktop.org/showdependencytree.cgi?id=37361hide_resolved=1 * 3.5 bugs tagged with 'regression' + 185(+6) bugs open of 853(+20) total * ~Component count net * + Writer - 80 (-1) + Crashes - 21 (+3) + Presentation - 18 (+1) + LibreOffice - 13 (-1) + Borders - 13 (+0) + Drawing - 13 (+0) + Database - 14 (+1) + Migration- 6 (-4) + Spreadsheet - 15 (+6) + Writer / RTF - 3 (+1) + Basic- 2 (+0) + https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsresolution=---query_format=advancedproduct=LibreOfficelist_id=36764 + Migration tracker: https://bugs.freedesktop.org/show_bug.cgi?id=43489 -- Thorsten pgpfiVQfcyf5A.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source unusedcode.easy
connectivity/source/drivers/mork/MorkParser.cxx | 47
connectivity/source/drivers/mork/MorkParser.hxx |1
unusedcode.easy |1
3 files changed, 49 deletions(-)
New commits:
commit 179e267704733fff336637a9de61598369e1dce9
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Oct 13 01:02:39 2012 +0200
Remove unused MorkParser::getRecordKeys4List
Change-Id: I755dce0ebee72a75c36b3cf36b52a2a1c736cc23
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx
b/connectivity/source/drivers/mork/MorkParser.cxx
index 0637331..b29486f 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -636,53 +636,6 @@ void MorkParser::retrieveLists(std::setstd::string
lists)
}
}
-void MorkParser::getRecordKeys4List(std::string listName,
std::vectorstd::string records)
-{
-MorkTableMap* tables = getTables(defaultScope_);
-if (!tables) return;
-for (MorkTableMap::iterator TableIter = tables-begin();
- TableIter != tables-end(); TableIter++ )
-{
-#ifdef VERBOSE
-std::cout \t Table:
- ( ( int ) TableIter-first 0 ? - : )
- std::hex std::uppercase TableIter-first std::endl;
-#endif
-MorkRowMap* rows = getRows( 0x81, TableIter-second );
-if (!rows) return;
-for ( MorkRowMap::iterator RowIter = rows-begin();
- RowIter != rows-end(); RowIter++ )
-{
-#ifdef VERBOSE
-std::cout \t\t\t Row Id:
- ( ( int ) RowIter-first 0 ? - : )
- std::hex std::uppercase RowIter-first std::endl;
-std::cout \t\t\t\t Cells:\r\n;
-#endif
-// Get cells
-bool listFound = false;
-for ( MorkCells::iterator cellsIter = RowIter-second.begin();
- cellsIter != RowIter-second.end(); cellsIter++ )
-{
-if (listFound)
-{
-if (cellsIter-first = 0xC7)
-{
-std::string value = getValue(cellsIter-second);
-records.push_back(value);
-}
-}
-else if ((cellsIter-first == 0xC1)
- listName == getValue( cellsIter-second ))
-{
-listFound = true;
-}
-}
-
-}
-}
-}
-
void MorkParser::getRecordKeysForListTable(std::string listName,
std::setint records)
{
MorkTableMap* tables = getTables(defaultScope_);
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx
b/connectivity/source/drivers/mork/MorkParser.hxx
index 8ac7584..789e569 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -114,7 +114,6 @@ public:
std::string getColumn( int oid );
void retrieveLists(std::setstd::string lists);
-void getRecordKeys4List(std::string listName, std::vectorstd::string
records);
void getRecordKeysForListTable(std::string listName, std::setint
records);
void dump();
diff --git a/unusedcode.easy b/unusedcode.easy
index 9b9df27..3218143 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const,
float, int, bool)
-MorkParser::getRecordKeys4List(std::basic_stringchar, std::char_traitschar,
std::allocatorchar , std::__debug::vectorstd::basic_stringchar,
std::char_traitschar, std::allocatorchar ,
std::allocatorstd::basic_stringchar, std::char_traitschar,
std::allocatorchar )
RelatedMultipart::getIds()
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*,
unsigned int, unsigned char)
ScCTB::ScCTB()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.in librsvg/config.h librsvg/ExternalProject_librsvg.mk librsvg/Library_librsvg-2-2.mk librsvg/librsvg-2.32.1-win32.patch librsvg/Makefile librsvg/m
Makefile.top |2 Module_tail_build.mk |1 Repository.mk |1 RepositoryExternal.mk | 145 RepositoryFixes.mk |7 + RepositoryModule_ooo.mk|1 config_host.mk.in |1 configure.in |3 librsvg/ExternalProject_librsvg.mk | 35 librsvg/Library_librsvg-2-2.mk | 70 + librsvg/Makefile |7 + librsvg/Module_librsvg.mk | 27 ++ librsvg/UnpackedTarball_rsvg.mk| 29 +++ librsvg/config.h | 27 ++ librsvg/librsvg-2.32.1-win32.patch | 146 - librsvg/makefile.mk| 129 ooo.lst.in |2 postprocess/prj/build.lst |2 18 files changed, 357 insertions(+), 278 deletions(-) New commits: commit 8615d09bb10a91444b993fa8806696a7b01f06f9 Author: Peter Foley pefol...@verizon.net Date: Wed Oct 10 21:43:21 2012 -0400 convert librsvg to gbuild Change-Id: I1f84f85abc4e2db3679e64d34671458779ca97fa diff --git a/Makefile.top b/Makefile.top index 9658703..2b0cac0 100644 --- a/Makefile.top +++ b/Makefile.top @@ -101,6 +101,7 @@ libcmis\ libmspub\ liborcus\ libpng\ +librsvg\ libvisio\ libwpd\ libwpg\ @@ -225,7 +226,6 @@ libcroco\ libexttextcat\ libgsf\ liblangtag\ -librsvg\ libxml2\ libxmlsec\ libxslt\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index af87b1c..b6c6512 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ libcmis \ libmspub \ liborcus \ + $(call gb_Helper_optional,LIBRSVG,librsvg) \ libvisio \ libwpd \ libwpg \ diff --git a/Repository.mk b/Repository.mk index 1914420..3768ae8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -465,6 +465,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ + librsvg-2-2 \ scriptframe \ sdbc2 \ smoketest \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 81f412d..5a3cf89 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1205,10 +1205,25 @@ endef else # ENABLE_GIO +ifeq ($(SYSTEM_GLIB),YES) + +gb_LinkTarget__use_gio := + +else # !SYSTEM_GLIB + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ + gio-2.0 \ +)) + define gb_LinkTarget__use_gio +$(call gb_LinkTarget_use_libraries,$(1),\ + gio-2.0 \ +) endef +endif # SYSTEM_GLIB + endif # ENABLE_GIO define gb_LinkTarget__use_gtk @@ -1234,11 +1249,26 @@ endif endef +ifeq ($(SYSTEM_GLIB),YES) + define gb_LinkTarget__use_gthread $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) +endef + +else # !SYSTEM_GLIB + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ + gthread-2.0 \ +)) +define gb_LinkTarget__use_gthread +$(call gb_LinkTarget_use_libraries,$(1),\ + gthread-2.0 \ +) endef +endif # SYSTEM_GLIB + ifeq ($(ENABLE_CUPS),TRUE) define gb_LinkTarget__use_cups @@ -1324,6 +1354,107 @@ gb_LinkTarget__use_telepathy := endif # ENABLE_TELEPATHY +ifeq ($(SYSTEM_LIBCROCO),NO) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ + croco-0.6-3 \ +)) + +define gb_LinkTarget__use_croco + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/external/libcroco-0.6 \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + croco-0.6-3 \ +) + +endef + +else # !SYSTEM_LIBCROCO + +gb_LinkTarget__use_croco := + +endif # SYSTEM_LIBCROCO + +ifeq ($(SYSTEM_PANGO),NO) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + pango-1.0 \ + pangocairo-1.0 \ +)) + +define gb_LinkTarget__use_pango + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/external/pango-1.0 \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + pango-1.0 \ + pangocairo-1.0 \ +) + +endef + +else # !SYSTEM_PANGO + +gb_LinkTarget__use_pango := + +endif # SYSTEM_PANGO + +ifeq ($(SYSTEM_LIBGSF),NO) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + gsf-1 \ +)) + +define gb_LinkTarget__use_gsf + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/external/libgsf-1 \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + gsf-1 \ +) + +endef + +else # !SYSTEM_LIBGSF + +gb_LinkTarget__use_gsf := + +endif # SYSTEM_LIBGSF + +ifeq ($(SYSTEM_GDKPIXBUF),NO) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + gdk_pixbuf-2.0 \ +)) + +define gb_LinkTarget__use_pixbuf + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ +
settings.mk : subst construct
Hello I am on master branch, and in http://opengrok.libreoffice.org/xref/core/solenv/inc/settings.mk#544 I see that : LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) This construct of subst is quite unusual, and a sample Makefile with OUT* := /cygdrive/d/src/libo/wntmsci12.pro OUTPATH := wntmsci12 COMMON_OUTDIR := $(OUTPATH) LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) .PHONY : test test : @echo PWD: $(PWD) @echo $(LOCAL_COMMON_OUT) Leads to no output for the 2nd echo. Is the construct legal or is there an issue here ? If it is legal, I'd love to have an explanation, because I had no great success when googling. Thanks for the input -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/Library_scfilt.mk sc/Library_sc.mk sc/source
sc/Library_sc.mk|1
sc/Library_scfilt.mk|1
sc/inc/orcusxml.hxx | 11 ++-
sc/source/core/tool/orcusxml.cxx| 22 ++
sc/source/filter/orcus/orcusfiltersimpl.cxx |2
sc/source/filter/orcus/orcusxml.cxx | 15
sc/source/ui/inc/xmlsourcedlg.hrc |4 -
sc/source/ui/inc/xmlsourcedlg.hxx | 15 ++--
sc/source/ui/src/xmlsourcedlg.src | 24 +-
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 100 +++-
10 files changed, 131 insertions(+), 64 deletions(-)
New commits:
commit 1100902333b55264855f3423bfc1f463e19c8f18
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 21:32:09 2012 -0400
More progress on the dialog.
Change-Id: Ib07d6d5de7cd0d72356bbb7859342f5038f05f95
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 2953b4a..89f231a 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -206,6 +206,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/navicfg \
sc/source/core/tool/odffmap \
sc/source/core/tool/optutil \
+ sc/source/core/tool/orcusxml \
sc/source/core/tool/parclass \
sc/source/core/tool/printopt \
sc/source/core/tool/prnsave \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 8809028..7a5256e 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -219,7 +219,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/worksheethelper \
sc/source/filter/oox/worksheetsettings \
sc/source/filter/orcus/orcusfiltersimpl \
-sc/source/filter/orcus/orcusxml \
))
# vim: set noet sw=4 ts=4:
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index cdc4679..d615ab6 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -10,10 +10,13 @@
#ifndef __SC_ORCUSXML_HXX__
#define __SC_ORCUSXML_HXX__
+#include scdllapi.h
#include vcl/image.hxx
#include boost/ptr_container/ptr_vector.hpp
+class SvLBoxEntry;
+
/**
* Parameter used during call to ScOrcusFilters::loadXMLStructure().
*/
@@ -22,14 +25,14 @@ struct ScOrcusXMLTreeParam
enum EntryType { ElementDefault, ElementRepeat, Attribute };
/** Custom data stored with each tree item. */
-struct TreeEntryUserData
+struct EntryData
{
EntryType meType;
-TreeEntryUserData(EntryType eType);
+SC_DLLPUBLIC EntryData(EntryType eType);
};
-typedef boost::ptr_vectorTreeEntryUserData UserDataStoreType;
+typedef boost::ptr_vectorEntryData UserDataStoreType;
Image maImgElementDefault;
Image maImgElementRepeat;
@@ -40,6 +43,8 @@ struct ScOrcusXMLTreeParam
* the life cycle of user datas.
*/
UserDataStoreType maUserDataStore;
+
+static SC_DLLPUBLIC EntryData* getUserData(SvLBoxEntry rEntry);
};
#endif
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
new file mode 100644
index 000..4e9ef80
--- /dev/null
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -0,0 +1,22 @@
+/* -*- 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/.
+ */
+
+#include orcusxml.hxx
+
+#include svtools/treelistbox.hxx
+
+ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
+meType(eType) {}
+
+ScOrcusXMLTreeParam::EntryData* ScOrcusXMLTreeParam::getUserData(SvLBoxEntry
rEntry)
+{
+return static_castScOrcusXMLTreeParam::EntryData*(rEntry.GetUserData());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index c5b8711..b4a1408 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -179,7 +179,7 @@ namespace {
void setUserDataToEntry(
SvLBoxEntry rEntry, ScOrcusXMLTreeParam::UserDataStoreType rStore,
ScOrcusXMLTreeParam::EntryType eType)
{
-rStore.push_back(new ScOrcusXMLTreeParam::TreeEntryUserData(eType));
+rStore.push_back(new ScOrcusXMLTreeParam::EntryData(eType));
rEntry.SetUserData(rStore.back());
}
diff --git a/sc/source/filter/orcus/orcusxml.cxx
b/sc/source/filter/orcus/orcusxml.cxx
deleted file mode 100644
index 68746be..000
--- a/sc/source/filter/orcus/orcusxml.cxx
+++ /dev/null
@@ -1,15 +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
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/inc sc/source
sc/inc/orcusxml.hxx |2 ++
sc/source/core/tool/orcusxml.cxx|2 +-
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 22 +-
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit c4b0a72e246c2915339e3e5e0d3140944c48aa36
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 21:47:20 2012 -0400
Keep track of linked cell positions.
Change-Id: I33e39e53b618270561ba7bfc236e8d8558bccffa
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index d615ab6..4fa223e 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -11,6 +11,7 @@
#define __SC_ORCUSXML_HXX__
#include scdllapi.h
+#include address.hxx
#include vcl/image.hxx
#include boost/ptr_container/ptr_vector.hpp
@@ -28,6 +29,7 @@ struct ScOrcusXMLTreeParam
struct EntryData
{
EntryType meType;
+ScAddress maLinkedPos; /// linked cell position (invalid if unlinked)
SC_DLLPUBLIC EntryData(EntryType eType);
};
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index 4e9ef80..c5e0ac1 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -12,7 +12,7 @@
#include svtools/treelistbox.hxx
ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
-meType(eType) {}
+meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID) {}
ScOrcusXMLTreeParam::EntryData* ScOrcusXMLTreeParam::getUserData(SvLBoxEntry
rEntry)
{
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index c4fb781..561f98d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -88,6 +88,17 @@ void ScXMLSourceDlg::SetReference(const ScRange rRange,
ScDocument* pDoc)
OUString aStr;
rRange.aStart.Format(aStr, SCA_ABS_3D, pDoc, pDoc-GetAddressConvention());
mpActiveEdit-SetRefString(aStr);
+
+// Set this address to currently selected tree item.
+SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
+if (!pEntry)
+return;
+
+ScOrcusXMLTreeParam::EntryData* pUserData =
ScOrcusXMLTreeParam::getUserData(*pEntry);
+if (!pUserData)
+return;
+
+pUserData-maLinkedPos = rRange.aStart;
}
void ScXMLSourceDlg::Deactivate()
@@ -188,10 +199,19 @@ void ScXMLSourceDlg::TreeItemSelected()
return;
ScOrcusXMLTreeParam::EntryData* pUserData =
ScOrcusXMLTreeParam::getUserData(*pEntry);
-
if (!pUserData)
return;
+const ScAddress rPos = pUserData-maLinkedPos;
+if (rPos.IsValid())
+{
+OUString aStr;
+rPos.Format(aStr, SCA_ABS_3D, mpDoc, mpDoc-GetAddressConvention());
+maRefEdit.SetRefString(aStr);
+}
+else
+maRefEdit.SetRefString(OUString());
+
switch (pUserData-meType)
{
case ScOrcusXMLTreeParam::Attribute:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/source
sc/source/core/data/table2.cxx | 18
sc/source/ui/condformat/condformatdlgentry.cxx | 27 -
sc/source/ui/condformat/condformathelper.cxx | 19 +++--
sc/source/ui/inc/condformatdlgentry.hxx|7 ++
sc/source/ui/inc/condformathelper.hxx |3 +-
5 files changed, 66 insertions(+), 8 deletions(-)
New commits:
commit 2ec03fc221e80479557f05f53972ca864f1ff4bb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Oct 12 16:46:55 2012 +0200
don't insert notes from deleted cells, fdo#55885
Change-Id: I036f0531dc2290c5eb480258bc70ec13b810e6bc
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 69c7d00..88a7ea1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -264,8 +264,13 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol,
SCROW nStartRow, SCSIZE
if (nRow = nStartRow)
{
-aNotes.insert(nCol, nRow - nSize, pPostIt);
-maNotes.ReleaseNote(nCol, nRow);
+if(nRow static_castSCROW(nSize))
+{
+aNotes.insert(nCol, nRow - nSize, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else
+maNotes.erase(nCol, nRow);
}
}
@@ -483,8 +488,13 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow,
SCROW nEndRow, SCSIZE
if (nCol = nStartCol)
{
-aNotes.insert(nCol - nSize, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow);
+if(nCol static_castSCCOL(nSize))
+{
+aNotes.insert(nCol - nSize, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else
+maNotes.erase(nCol, nRow);
}
}
commit 979c4753831eec5e05df685880cc2052bea64307
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Oct 12 11:57:07 2012 +0200
improve showing the condition text when the entry is collapsed
Change-Id: I298f80c9df39156f950880a530076e0b0edf27b5
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 646f928..58f59bb 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -289,7 +289,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry()
const
rtl::OUString ScConditionFrmtEntry::GetExpressionString()
{
-return ScCondFormatHelper::GetExpression(CONDITION,
maLbCondType.GetSelectEntryPos());
+return ScCondFormatHelper::GetExpression(CONDITION,
maLbCondType.GetSelectEntryPos(), maEdVal1.GetText(), maEdVal2.GetText());
}
ScFormatEntry* ScConditionFrmtEntry::GetEntry() const
@@ -483,7 +483,7 @@ ScFormatEntry* ScFormulaFrmtEntry::GetEntry() const
rtl::OUString ScFormulaFrmtEntry::GetExpressionString()
{
-return ScCondFormatHelper::GetExpression(FORMULA, 0);
+return ScCondFormatHelper::GetExpression(FORMULA, 0,
maEdFormula.GetText());
}
void ScFormulaFrmtEntry::SetActive()
diff --git a/sc/source/ui/condformat/condformathelper.cxx
b/sc/source/ui/condformat/condformathelper.cxx
index 1ec8607..1f658e3 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -91,7 +91,7 @@ rtl::OUString ScCondFormatHelper::GetExpression(const
ScConditionalFormat rForm
aBuffer.append(rtl::OUString( and ));
aBuffer.append(pEntry-GetExpression(rPos, 1));
}
-else
+else if(eMode = SC_COND_NOTEQUAL)
{
aBuffer.append(pEntry-GetExpression(rPos, 0));
}
@@ -110,12 +110,27 @@ rtl::OUString ScCondFormatHelper::GetExpression(const
ScConditionalFormat rForm
return aBuffer.makeStringAndClear();
}
-rtl::OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType,
sal_Int32 nIndex )
+rtl::OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType,
sal_Int32 nIndex,
+rtl::OUString aStr1, rtl::OUString aStr2 )
{
rtl::OUStringBuffer aBuffer(getTextForType(eType));
aBuffer.append(rtl::OUString( ));
if(eType == CONDITION)
+{
aBuffer.append(getExpression(nIndex));
+if(nIndex = 7)
+{
+aBuffer.append( ).append(aStr1);
+if(nIndex == 6 || nIndex == 7)
+{
+aBuffer.append( and ).append(aStr2);
+}
+}
+}
+else if(eType == FORMULA)
+{
+aBuffer.append( ).append(aStr1);
+}
return aBuffer.makeStringAndClear();
}
diff --git a/sc/source/ui/inc/condformathelper.hxx
b/sc/source/ui/inc/condformathelper.hxx
index 48c269d..297d032 100644
---
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/excel/xiescher.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ea50fe437b4f61e6c97d81721441da2b7d1e2f66
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 15:25:20 2012 -0400
Check for null object. The OLE name may not always be set.
Change-Id: Ib3e55af8870b41a5b76179d2215fc5125ceda5af
(cherry picked from commit fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10)
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 900d2e6..8940167 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3210,7 +3210,7 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB
nTab, sal_uInt16 nObjId )
rtl::OUString sOleName;
String sCodeName = GetExtDocOptions().GetCodeName( nTab );
-if ( mxOleCtrlNameOverride-hasByName( sCodeName ) )
+if (mxOleCtrlNameOverride.is()
mxOleCtrlNameOverride-hasByName(sCodeName))
{
Reference XIndexContainer xIdToOleName;
mxOleCtrlNameOverride-getByName( sCodeName ) = xIdToOleName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6-3][REVIEWED 3-6] Simple missing null object check to fix crasher.
Hey Kohei http://cgit.freedesktop.org/libreoffice/core/commit/?id=fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10 backported to the 3-6 branch. Without this check, importing the following document http://www.bedrunecka.cz/epd/3_naklady_a_kalkulace.ppt will crash soffice. I think the change is simple enough to be backported safely. I agree and pushed to 3-6 with my sign-off. I'D like to see this patch also in 3-6-3 so we need two more sign-offs for it. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6 3-6-3] fix for fdo#55885, don't insert notes to deleted cells
Hey, [1] prevents to insert notes to deleted cells. These notes have than negative col or row numbers so they produce a crash in the export code. Regards, Markus [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=2ec03fc221e80479557f05f53972ca864f1ff4bb ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: settings.mk : subst construct
On Fri, Oct 12, 2012 at 6:45 PM, Mat M m...@gmx.fr wrote: Is the construct legal or is there an issue here ? If it is legal, I'd love to have an explanation, because I had no great success when googling. http://www.openoffice.org/tools/dmake/dmake_4.3.html $(subst,pat,replacement data) Will search for pat in data and will replace any occurrence of pat with the replacement string. The expansion $(subst,.o,.c $(OBJECTS)) is equivalent to: $(OBJECTS:s/.o/.c/) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6-3] Simple missing null object check to fix crasher.
On Sat, 2012-10-13 at 04:39 +0200, Markus Mohrhard wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10 I think the change is simple enough to be backported safely. I agree and pushed to 3-6 with my sign-off. I'D like to see this patch also in 3-6-3 so we need two more sign-offs for it. You have my +1 for -3-6-3 - one more needed. Nice catch Kohei :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 3 commits - sc/inc sc/source
sc/inc/orcusxml.hxx |1
sc/source/core/tool/orcusxml.cxx|2
sc/source/ui/inc/xmlsourcedlg.hxx |9 ++
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 128 +---
4 files changed, 128 insertions(+), 12 deletions(-)
New commits:
commit ada462b976afcf8427b2fc546e67c89c389a6b84
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 23:42:27 2012 -0400
Handle selection of repeat element.
Change-Id: I73eb83fbbd6deb39ba3e736410b8d5b50f3dffaa
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 6f20942..0f8f0cb 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -83,10 +83,14 @@ private:
void SetRangeLinkable();
/**
- * Check if any of its parents is linked or repeated.
+ * Check if any of its parents is linked or repeated. The passed entry is
+ * not checked; its parent is the first one to be checked, then all its
+ * parents get checked all the way to the root.
*/
bool IsParentDirty(SvLBoxEntry* pEntry) const;
+bool IsChildrenDirty(SvLBoxEntry* pEntry) const;
+
DECL_LINK(GetFocusHdl, Control*);
DECL_LINK(LoseFocusHdl, Control*);
DECL_LINK(BtnPressedHdl, Button*);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 75cba63..e6f39e3 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -267,12 +267,26 @@ void ScXMLSourceDlg::DefaultElementSelected(SvLBoxEntry
rEntry)
void ScXMLSourceDlg::RepeatElementSelected(SvLBoxEntry rEntry)
{
-// TODO: Check all its child elements / attributes and make sure non of
-// them are linked or repeat elements. In the future we will support
-// range linking of repeat element who has another repeat elements. But
-// first I need to support that in orcus.
+// Check all its parents first.
-SetNonLinkable();
+if (IsParentDirty(rEntry))
+{
+SetNonLinkable();
+return;
+}
+
+// Check all its child elements / attributes and make sure non of them are
+// linked or repeat elements. In the future we will support range linking
+// of repeat element who has another repeat elements. But first I need to
+// support that scenario in orcus.
+
+if (IsChildrenDirty(rEntry))
+{
+SetNonLinkable();
+return;
+}
+
+SetRangeLinkable();
}
void ScXMLSourceDlg::AttributeSelected(SvLBoxEntry rEntry)
@@ -346,6 +360,32 @@ bool ScXMLSourceDlg::IsParentDirty(SvLBoxEntry* pEntry)
const
return false;
}
+bool ScXMLSourceDlg::IsChildrenDirty(SvLBoxEntry* pEntry) const
+{
+ScOrcusXMLTreeParam::EntryData* pUserData = NULL;
+for (SvLBoxEntry* pChild = maLbTree.FirstChild(pEntry); pChild; pChild =
maLbTree.NextSibling(pChild))
+{
+pUserData = ScOrcusXMLTreeParam::getUserData(*pChild);
+OSL_ASSERT(pUserData);
+if (pUserData-maLinkedPos.IsValid())
+// Already linked.
+return true;
+
+if (pUserData-meType == ScOrcusXMLTreeParam::ElementRepeat)
+// We don't support linking of nested repeat elements (yet).
+return true;
+
+if (pUserData-meType == ScOrcusXMLTreeParam::ElementDefault)
+{
+// Check recursively.
+if (IsChildrenDirty(pChild))
+return true;
+}
+}
+
+return false;
+}
+
IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl)
{
HandleGetFocus(pCtrl);
commit 259a08ae77b24c8805ff023813f2f36394baee12
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 23:12:52 2012 -0400
I need to check for repeating parent elements too.
Change-Id: I52e87c93e6f3d0108cf517c33f605490dd9a1fc4
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx
b/sc/source/ui/inc/xmlsourcedlg.hxx
index c3953e4..6f20942 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -82,6 +82,9 @@ private:
void SetSingleLinkable();
void SetRangeLinkable();
+/**
+ * Check if any of its parents is linked or repeated.
+ */
bool IsParentDirty(SvLBoxEntry* pEntry) const;
DECL_LINK(GetFocusHdl, Control*);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e75f1f6..75cba63 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -336,6 +336,11 @@ bool ScXMLSourceDlg::IsParentDirty(SvLBoxEntry* pEntry)
const
// This parent is already linked.
return true;
}
+if (pUserData-meType == ScOrcusXMLTreeParam::ElementRepeat)
+{
+// This is a repeat element.
+return true;
+}
pParent = maLbTree.GetParent(pParent);
}
return false;
commit 19821e5fd3276efba310ea772629fc5c13abe733
Author:
[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - 2 commits - sc/source
sc/source/ui/xmlsource/xmlsourcedlg.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d0fac0b0fd65a28634b263a91f7ea9960facd76b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 23:53:44 2012 -0400
When setting a link position to a repeat element, set the range parent flag.
Change-Id: I86b999297f96c4a2e55682d1da9a6c2e62f5f472
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 4a0684d..b9d518b 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -99,6 +99,7 @@ void ScXMLSourceDlg::SetReference(const ScRange rRange,
ScDocument* pDoc)
return;
pUserData-maLinkedPos = rRange.aStart;
+pUserData-mbRangeParent = pUserData-meType ==
ScOrcusXMLTreeParam::ElementRepeat;
}
void ScXMLSourceDlg::Deactivate()
commit ab267d6f7d8175e7c7873f085b46c726046a2d0d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Oct 12 23:45:50 2012 -0400
Don't allow reference mode when the control is disabled.
Change-Id: I9ba6121ee67f3f4fc0b4a1fb3b14036fce2e88e9
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index e6f39e3..4a0684d 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -74,7 +74,7 @@ ScXMLSourceDlg::~ScXMLSourceDlg()
sal_Bool ScXMLSourceDlg::IsRefInputMode() const
{
-return mpActiveEdit != NULL;
+return mpActiveEdit != NULL mpActiveEdit-IsEnabled();
}
void ScXMLSourceDlg::SetReference(const ScRange rRange, ScDocument* pDoc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] LibreOffice Help-Send Feedback BSA
Hi Marc Paré et al., Am 11.10.12 19:09, schrieb Marc Paré: These are quite a few steps for a user who wishes to leave feedback on the suite. I have to agree with Marc that it is currently rather difficult for an “ordinary” user to file his first bug. One could answer here: Our problem is not, that we would not get enough bug reports; at the moment, our problems are a) that we often get bad bug reports and b) that we can’t handle all the bug reports we get. Therefore, one could argue we should maintain the status quo, because the difficulty to file “your first bug report” was good to prevent more “ordinary” users from filing more bad bug reports ;-) However, this view seems a bit cynic to me; therefore I would agree to Marc that it would be nice to make filing bug reports easier, even for “ordinary” users who do not yet have a bugzilla account. I do not know how this can be achieved (the technical side of the problem), but this is probably not a big problem once we have got a consensus about what we want ... Just my 2 cents (forget them if I wrote something stupid) -- Roman ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice Help-Send Feedback BSA
Why not lead people to ask.libreoffice.org? Like Mozilla I can give a quick feedback to http://input.mozilla.org. Whoever is active there should point people to bugzilla if this is really a bug. Maybe most of bad bug descriptions are rather user misunderstandings that can be answered at ask.libreoffice.org. Only my first thought. Marc Am 12.10.2012 10:33, schrieb Nino Novak: Hi Roman, Am 12.10.2012 09:28 schrieb Roman Eisele: Am 11.10.12 19:09, schrieb Marc Paré: I have to agree with Marc that it is currently rather difficult for an “ordinary” user to file his first bug. One could answer here: Our problem is not, that we would not get enough bug reports; at the moment, our problems are a) that we often get bad bug reports and b) that we can’t handle all the bug reports we get. Therefore, one could argue we should maintain the status quo, because the difficulty to file “your first bug report” was good to prevent more “ordinary” users from filing more bad bug reports ;-) However, this view seems a bit cynic to me; therefore I would agree to Marc that it would be nice to make filing bug reports easier, even for “ordinary” users who do not yet have a bugzilla account. I do not know how this can be achieved (the technical side of the problem), but this is probably not a big problem once we have got a consensus about what we want ... So, what is your proposal? Should anonymous bug filing be enabled? (I don't think this is a good idea.) Or should the somewhat complicated process Marc described be improved? And how? A possibility I spontaneously see is to split the button into two: Send Feedback and Report Bug, and to direct people e.g. to the new forum after pressing Send Feedback. So chance is that they are not lost completely. But for the FDO Bugzilla registration process I do not really see how it could be improved. If you don't have an account at FDO, you *have* to register. After registration, you are directed to FDO Bugzilla - as the registration is unaware that you came from BSA. The only possibility I see is to pass this proveniance info to bugzilla registration and let it email you back a BSA link instead of an FDO link with registration confirmation. EasyHack? Nino ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Programa Surpreenda MasterCard
MasterCard Brasil Participe do Programa Surpreenda MasterCard Para participar, basta cadastrar o cartão no site www.naotempreco.com.br/cadastro. Após o cadastro, cada transação, de qualquer valor, vale um ponto. Os pontos podem ser trocados por vouchers. Com o voucher, na compra de um dos produtos ou serviços cadastrados na promoção, o portador do cartão ganha outro, de graça. Os pontos acumulados que não forem trocados por vouchers transformam-se em cupons dque concorrem a sorteios mensais de dois cartões pré-pagos no valor de R$ 50 mil cada, um para o titular do cartão e outro para presentear quem ele indicar. Cadastre-se e comece a usufruir agora mesmo dos benefícios! Clique aqui para se cadastrar. Atenciosamente, Departamento de Promoções MasterCard® ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Programa Surpreenda MasterCard
MasterCard Brasil Participe do Programa Surpreenda MasterCard Para participar, basta cadastrar o cartão no site www.naotempreco.com.br/cadastro. Após o cadastro, cada transação, de qualquer valor, vale um ponto. Os pontos podem ser trocados por vouchers. Com o voucher, na compra de um dos produtos ou serviços cadastrados na promoção, o portador do cartão ganha outro, de graça. Os pontos acumulados que não forem trocados por vouchers transformam-se em cupons dque concorrem a sorteios mensais de dois cartões pré-pagos no valor de R$ 50 mil cada, um para o titular do cartão e outro para presentear quem ele indicar. Cadastre-se e comece a usufruir agora mesmo dos benefícios! Clique aqui para se cadastrar. Atenciosamente, Departamento de Promoções MasterCard® ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Minutes of the ESC call 2012-10-11
Attending: Joel, Fridrich, Thorsten, Eike, Andras, Caolan, Kendy, David, Mirek, Kohei, Cedric, Rodo, Andras, Astron, Michael S. * Completed Action Items + Petr to decide release-schedule / overlap gap issue + done/expired + mail thb/sweetshark for a cheap Berlin / hotel room + done + push distro/suse/suse-3.6 branch (Andras) + done * Pending Action Items + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + [in progress] enable automatic help build / sync. on a cron-job (Kendy) + script written, deploy it + issues to look into if we can + fdo#34548 - review Michael's patch (Thorsten) + fdo#55290 - master doesn't install on windows (dtardon) + fdo#55360 - mac specific text issue (Thorsten) + fdo#51023 - impress DD crasher - (Radek) + ping Tollef wrt. sysadmin work (Bjoern) * Release Engineering update (Petr) + vacation / quality report (deferred) + should we enable on-line updates to 3.6.2 ? + fdo#55560 / fdo#52022 needs fixing before general update + upgrade 3.5.0-3.5.1 to 3.6.2 though, those versions are clearly inferior. + 3.5.7 status + 3.5.7 rc2 built (fixes docx crasher), due next week + 3.6.3 rc1 status + builds running, mirror push tomorrow + rc2 22nd of october (fdo#55560 needs fixing!) * UI / design update (Astron) + gtk3 prototype + interesting food for thought + icons for new conditional formats in cells ... (pending) + no chat this week, handling happens on the list * conference (Thorsten) + in-person ESC meeting 16th October, 17:00 local time at the venue. * QA update (Joel) + HardHack list moved to wiki - http://wiki.documentfoundation.org/HardHacks - updates / assignments appreciated there + 3.5 MAB needs cherry-picking and folding into 3.6 MAB (some don't seem to be valid most annoying) + some thoughts around another 3.5 release * Open 3.7 MAB / regressions [ there should be none ]: + fdo#55290 - LOdev 3.7 won't install [ on Windows ]. Error 1935 (dtardon) + fdo#55560 - CRASH when Format Cells (menu and Context menu) (Fridrich/Kohei) + fdo#55570 - significant autocorrect slow-down (Stephan) + fdo#55685 - CRASH when create or modify Character Style or Paragraph Style (fixed by Caolan) + https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1 * Open HardHacks + fdo#50285 - Saving document as .doc introduces bogus superscript text * 3.6 most annoying bugs ... + 27 (of 127) older 44/139 46/137 45/132 44/127 39/119 27/96 26/91 21/80 11/58 21%32%34%34%35% 33% 28% 29% 26% 19% + https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1 * 3.5 most annoying bugs ... + 78 open (of 278) older 81/279 82/279 83/279 80/270 81/269 73/258 73/257 28% 29%29%30%30%30%26%28% + https://bugs.freedesktop.org/showdependencytree.cgi?id=37361hide_resolved=1 * 3.5 bugs tagged with 'regression' + 185(+6) bugs open of 853(+20) total * ~Component count net * + Writer - 80 (-1) + Crashes - 21 (+3) + Presentation - 18 (+1) + LibreOffice - 13 (-1) + Borders - 13 (+0) + Drawing - 13 (+0) + Database - 14 (+1) + Migration- 6 (-4) + Spreadsheet - 15 (+6) + Writer / RTF - 3 (+1) + Basic- 2 (+0) + https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsresolution=---query_format=advancedproduct=LibreOfficelist_id=36764 + Migration tracker: https://bugs.freedesktop.org/show_bug.cgi?id=43489 -- Thorsten pgpPmEAf2V2e8.pgp Description: PGP signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 --- Comment #8 from Alex Thurgood ipla...@yahoo.co.uk --- Hi Rainer, FM3 files are the formatting data for wk3 formatted files, so they go together with the wk3 file. Lotus 123 used to use both. See here : http://www.fileinfo.com/extension/fm3 Not that that changes anything with respect to this bug report. I don't think these files were ever imported by OOo, let alone LO, so IMHO this would be a feature request, or enhancement of the existing file filters. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55897] New: Pasting from Calc into writer table with paste special RTF changes page style
https://bugs.freedesktop.org/show_bug.cgi?id=55897 Priority: medium Bug ID: 55897 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Pasting from Calc into writer table with paste special RTF changes page style Severity: normal Classification: Unclassified OS: All Reporter: gdna7...@hotmail.com Hardware: Other Status: UNCONFIRMED Version: 3.6.2.2 release Component: Writer Product: LibreOffice Created attachment 68471 -- https://bugs.freedesktop.org/attachment.cgi?id=68471action=edit Writer file with custom style that shows the problem Steps to reproduce: select some cells in an .ods file copy open attached writer file paste special RTF (into a cell of the writer table) Expected result: Cells are pasted, page style unmodified Actual result: Cells are pasted, page style reverts to default, undo does not revert to used page style. Sometimes I have observed loss of the custom page style (which is a big problem for me). However, I can not reproduce this reliably. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55737] Names of cells when clicking on it
https://bugs.freedesktop.org/show_bug.cgi?id=55737 --- Comment #3 from Roman Eisele b...@eikota.de --- Because it was not yet confirmed by an independent reviewer ;-) Believe it or not, it takes some time to reproduce a bug, check for duplicates, etc. ... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45585] Closes without error or crash if opening a specific .doc file
https://bugs.freedesktop.org/show_bug.cgi?id=45585 --- Comment #6 from Roman Eisele b...@eikota.de --- For the sake of platform completeness ;-): NOT reproducible on Mac OS X (10.6.8, Intel) with * LibreOffice 3.5.7.1 * LibreOffice 3.6.2.2 both with German langpack installed. Therefore fileopen problem most probably solved. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44895] REGRESSION Autofilter does not work if range contains only one value and empty cells
https://bugs.freedesktop.org/show_bug.cgi?id=44895 --- Comment #7 from Nikos gdna7...@hotmail.com --- I think a better workaround is using the Not Empty filter, since it does not change the data...nonetheless, even after half a year, people in our office keep coming to me, wondering why it does not work...so, I insist not intuitive -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49783] FILESAVE: Hang during file save when Mac has problem with unrelated network share
https://bugs.freedesktop.org/show_bug.cgi?id=49783 Roman Eisele b...@eikota.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from Roman Eisele b...@eikota.de --- (Status should be NEEDINFO according to comment #2.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 53667] Poor performance loading a document (i.e., a .ODT) for second time
https://bugs.freedesktop.org/show_bug.cgi?id=53667 Roman Eisele b...@eikota.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #5 from Roman Eisele b...@eikota.de --- (Status should be NEEDINFO because of the questions in comment #4.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55879] FILEOPEN: CRASH with particular .ots
https://bugs.freedesktop.org/show_bug.cgi?id=55879 --- Comment #4 from A. Stucki a.stu...@solcept.ch --- Thank a lot for the fast investigation! - Sorry for the odt/ ots confusion - It crashed on a Win7 Ultimate 32-bit - IMHO there is a connection with the conditional formatting, I reverted to LibreOffice 3.5.7.2 (we use LO productive) and now everything is fine - I have other versions of this template (with more sheets text), using LO 3.6.X there was trouble (crash/ spreadsheet lost formatting) several times (but only after I added the conditional formating) - Because of reverting, I also cannot try the user profile story -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55900] New: FILEOPEN: opening a special file crashes LibreOffice while OpenOffice can handle it
https://bugs.freedesktop.org/show_bug.cgi?id=55900 Priority: medium Bug ID: 55900 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN: opening a special file crashes LibreOffice while OpenOffice can handle it Severity: normal Classification: Unclassified OS: All Reporter: mder...@nurfuerspam.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 3.6.2.2 release Component: Spreadsheet Product: LibreOffice Created attachment 68473 -- https://bugs.freedesktop.org/attachment.cgi?id=68473action=edit spreadsheet-document with crashing behavior, 2 tabs, calculating-cells Problem description: Steps to reproduce: 1. opening 2. error-message [ger] Durch einen unerwarteten Fehler ist LibreOffice abgestürzt. ... Die folgenden Dokumente werden wieder hergestellt: (List contains no entry!) Current behavior: crash-message Expected behavior: opening Platform (if different from the browser): -/- Browser: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20100101 Firefox/15.0.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55900] FILEOPEN: opening a special file crashes LibreOffice while OpenOffice can handle it
https://bugs.freedesktop.org/show_bug.cgi?id=55900 mder...@nurfuerspam.de changed: What|Removed |Added Attachment #68473|JSB Buchungen 2012 |Buchungen 2012 filename|Übersicht-bugzilla.ods |Übersicht-bugzilla.ods -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55900] FILEOPEN: opening a special file crashes LibreOffice while OpenOffice can handle it
https://bugs.freedesktop.org/show_bug.cgi?id=55900 mder...@nurfuerspam.de changed: What|Removed |Added OS|All |Windows (All) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55437] CRASH FILEOPEN .odt with formulas converted in some steps from particular .DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=55437 ape os...@yandex.ru changed: What|Removed |Added CC||fridrich.st...@bluewin.ch, ||os...@yandex.ru --- Comment #14 from ape os...@yandex.ru --- @:_fridrich.st...@bluewin.ch Fridrich! It may be necessary to change the build environment - fall back to clean MS_VCR_2008? I think that checking alibis for SP1 is urgently needed, especially given the new error NEEDINFO in the tree «LO-dev_3.7.0.0». nthieb...@gmail.com in the tree «W2008R2@16-minimal_build» uses this environment. Maybe that's why it, unlike the branches «W2008R2@20-With-Symbol-Bytemark-Hosting» (it is assembled, but among MS_VCR-2008sp1), there a number of errors. Unfortunately, I can’t find a link to the page of Microsoft, which is written in the code to specify a particular version of MSVCR (i.e. VC90.CRT_9.0.21022.8 or VC90.CRT_9.0.21022.218 or VC90.CRT_9.0.30729. 6161 ...). It is possible that somewhere in the code specifically the version 9.0.21022 - hence the problem. Sorry, that appealed to You directly to see Your email address in the «build_info_3.6.4.0_win_x86». -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55903] New: Zoom (+) icon is unusable
https://bugs.freedesktop.org/show_bug.cgi?id=55903 Priority: medium Bug ID: 55903 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Zoom (+) icon is unusable Severity: normal Classification: Unclassified OS: Linux (All) Reporter: gavadedattatray...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 3.4.4 release Component: Presentation Product: LibreOffice When we are clicking on zoom + icon slide size does not get changed. So it is unusable onlu Zoom(-) is working -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51431] EDITING: copy and paste end of text
https://bugs.freedesktop.org/show_bug.cgi?id=51431 Roman Eisele b...@eikota.de changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #2 from Roman Eisele b...@eikota.de --- (In reply to comment #1) this problem does not exist any more with next release 3.6 Thank you very much for this hint! So we can close this bug report. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47250] Writer crashes when control-clicking/right-clicking on table cells to get the context menu
https://bugs.freedesktop.org/show_bug.cgi?id=47250 --- Comment #9 from Reiner Anselm rans...@gwdg.de --- News from testing: If you deactivate DudenKorrektor, LO don't crash. I use DudenKorrektor 8.0.0.2. After the re-activation LO crashes again. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55904] New: Color replacer in unusable
https://bugs.freedesktop.org/show_bug.cgi?id=55904 Priority: medium Bug ID: 55904 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Color replacer in unusable Severity: normal Classification: Unclassified OS: Linux (All) Reporter: gavadedattatray...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 3.4.4 release Component: Presentation Product: LibreOffice Color replacer button is not active and replacer palette is not showing color window or we can not insert colors manually or we can not replaces colours. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55897] Pasting from Calc into Writer table with paste special RTF changes page style
https://bugs.freedesktop.org/show_bug.cgi?id=55897 Roman Eisele b...@eikota.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||b...@eikota.de Summary|Pasting from Calc into |Pasting from Calc into |writer table with paste |Writer table with paste |special RTF changes page|special RTF changes page |style |style Ever confirmed|0 |1 --- Comment #1 from Roman Eisele b...@eikota.de --- Thank you very much for your bug report! An important question: Do you have checked the option “Enable experimental (unstable) features” in Options LibreOffice General? (This could explain that behaviour!) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47658] add Open-ID authentification for MozTrap
https://bugs.freedesktop.org/show_bug.cgi?id=47658 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |yfji...@novell.com |desktop.org | --- Comment #9 from Björn Michaelsen bjoern.michael...@canonical.com --- Awesome! Can this one be closed then? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47250] Writer crashes when control-clicking/right-clicking on table cells to get the context menu
https://bugs.freedesktop.org/show_bug.cgi?id=47250 Roman Eisele b...@eikota.de changed: What|Removed |Added Status|NEEDINFO|NEW Component|Writer |Extensions --- Comment #10 from Roman Eisele b...@eikota.de --- Thank you for testing! Therefore, and because of the stack trace, which suggests that the crash is related to Duden::ContextMenuInterceptor::notifyContextMenuExecute() -- does the extension raise an unhandled exception? --, I think this either a bug *in* or a LibO problem *with* the DudenKorrektor extension. → Changing Component field. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47250] Writer crashes when control-clicking/right-clicking on table cells, if DudenKorrektor extension is installed
https://bugs.freedesktop.org/show_bug.cgi?id=47250 Roman Eisele b...@eikota.de changed: What|Removed |Added Summary|Writer crashes when |Writer crashes when |control-clicking/right-clic |control-clicking/right-clic |king on table cells to get |king on table cells, if |the context menu|DudenKorrektor extension is ||installed -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55807, which changed state. Bug 55807 Summary: CRASH when accessing Tools Outline Numbering... https://bugs.freedesktop.org/show_bug.cgi?id=55807 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45089] Table formatting damaged
https://bugs.freedesktop.org/show_bug.cgi?id=45089 bfoman bfo.bugm...@spamgourmet.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #8 from bfoman bfo.bugm...@spamgourmet.com --- NEW as confirmed in comment 6 and comment 7. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42497] Dead contributor-links in Extension Manager
https://bugs.freedesktop.org/show_bug.cgi?id=42497 Roman Eisele b...@eikota.de changed: What|Removed |Added CC||b...@eikota.de --- Comment #2 from Roman Eisele b...@eikota.de --- Testing with LibreOffice 3.6.2.2 (on Mac OS X) suggests to me that this issue is gone -- the “PDF Import” extension, now version 1.0.6, has listed “The Document Foundation” as vendor, and clicking on the link works fine for me. @Rainer: Can we close this as RESOLVED/WORKSFORME ?! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47250] Writer crashes when control-clicking/right-clicking on table cells, if DudenKorrektor extension is installed
https://bugs.freedesktop.org/show_bug.cgi?id=47250 Roman Eisele b...@eikota.de changed: What|Removed |Added CC||courrier.oou.fr.mjk@googlem ||ail.com, ||dtar...@redhat.com, ||fridrich.st...@bluewin.ch, ||stephanhen...@arcor.de --- Comment #11 from Roman Eisele b...@eikota.de --- @ David Tardon; @ manj_k, Fridrich Strba, and Stephan Hennig: I have added you all to the CC list of this bug report, because you, David, are our Extension management expert, and the others (manj_k, Fridrich Strba, and Stephan Hennig) have some experience with the Duden Korrektor extension. Can you please help with this issue?: This seems to be either a bug in the Duden Korrektor 8.0.0.2 extension, or a bug in LibreOffice which affects especially this extension. How can we judge this? And what should we do about this bug -- can some LibreOffice developer look into it, or should we report it to Duden (and how)? Thank you very much! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55560] EDITING: CRASH when Format Cells (menu and Context menu)
https://bugs.freedesktop.org/show_bug.cgi?id=55560 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #11 from Caolán McNamara caol...@redhat.com --- *** This bug has been marked as a duplicate of bug 55685 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55685] CRASH when create or modify Character Style or Paragraph Style
https://bugs.freedesktop.org/show_bug.cgi?id=55685 Caolán McNamara caol...@redhat.com changed: What|Removed |Added CC||detective.conan.1412@gmail. ||com --- Comment #10 from Caolán McNamara caol...@redhat.com --- *** Bug 55560 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 55560, which changed state. Bug 55560 Summary: EDITING: CRASH when Format Cells (menu and Context menu) https://bugs.freedesktop.org/show_bug.cgi?id=55560 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55685] CRASH when create or modify Character Style or Paragraph Style
https://bugs.freedesktop.org/show_bug.cgi?id=55685 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55842] no focus on frame for editing
https://bugs.freedesktop.org/show_bug.cgi?id=55842 --- Comment #2 from Roman Schleicher romanschleic...@web.de --- Created attachment 68479 -- https://bugs.freedesktop.org/attachment.cgi?id=68479action=edit Template for writing different letters in Writer Different pagestyles called Briefseite1 and Briefseite2 with multiple textframes. The textframes contain placeholder and other pre-defined values. You can test the bug by editting the top border e.g. in the style Briefseite1. After that try to edit the different textframes. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55842] no focus on frame for editing
https://bugs.freedesktop.org/show_bug.cgi?id=55842 Roman Schleicher romanschleic...@web.de changed: What|Removed |Added OS|Mac OS X (All) |Windows (All) --- Comment #3 from Roman Schleicher romanschleic...@web.de --- (In reply to comment #2) Created attachment 68479 [details] Template for writing different letters in Writer I can reproduce this error when using the installed or the portable edition of LO 3.6.2.2 on Windows 7 64bit. But it only occurs if the frames are not in the area from a normal page like you get if you start a new document. I changed the top-border of the first page back to a normal size (2 cm from top) and then the frames are in the page-area and I can edit them as normal. If I have my top-border edited to 13 cm from the top, the frames are out of this area and the focus error occurs. This error wasn't in a portable (maybe also installed) version of LO 3.6.1.2. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
