[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/sal.py | 65 ++
1 file changed, 65 insertions(+)
New commits:
commit 7c9dbfd3e857ee2694505eab5846141923aa4381
Author: Catalin Iacob iacobcata...@gmail.com
Date: Wed Feb 29 22:25:13 2012 +0100
fdo #46446: add python gdb helpers for osl::FileBase
diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 75d1cb1..e26c008 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -26,6 +26,7 @@
# instead of those above.
import gdb
+import gdb.types
from libreoffice.util import printing
from libreoffice.util.string import StringPrinterHelper
@@ -90,6 +91,69 @@ class RtlReferencePrinter(object):
else:
return empty %s % self.typename
+class OslFileStatusPrinter(object):
+'''Prints oslFileStatus'''
+
+def __init__(self, typename, val):
+self.val = val
+
+def to_string(self):
+osl_file_type = gdb.lookup_type('oslFileType').strip_typedefs()
+fields_to_enum_val = gdb.types.make_enum_dict(osl_file_type)
+
+etype = self.field_val_if_valid('eType')
+if etype is not None:
+pretty_etype = 'unknown type' # in case it's not one of the
fields
+
+for field_name, field_val in fields_to_enum_val.iteritems():
+if etype == field_val:
+pretty_etype = self.pretty_file_type(field_name)
+else:
+pretty_etype = 'invalid type'
+
+file_url = self.field_val_if_valid('ustrFileURL')
+if file_url is not None:
+pretty_file_url = str(file_url.dereference())
+else:
+pretty_file_url = 'invalid file url'
+
+pretty_file_status = pretty_etype + ': ' + pretty_file_url
+
+# for links append the link target if valid
+if etype == fields_to_enum_val['osl_File_Type_Link']:
+link_target = self.field_val_if_valid('ustrLinkTargetURL')
+if link_target is None:
+pretty_link_target = 'invalid link target'
+else:
+pretty_link_target = str(link_target.dereference())
+
+pretty_file_status += ' - ' + pretty_link_target
+
+return pretty_file_status
+
+def pretty_file_type(self, file_type_name):
+if file_type_name != 'osl_File_Type_Regular':
+return file_type_name.replace('osl_File_Type_', '').lower()
+else:
+return 'file' # regular is not very descriptive, file is better
+
+def field_val_if_valid(self, field):
+mask_for_field = {'eType': 0x0001,
+ 'uAttributes': 0x0002,
+ 'aCreationTime': 0x0010,
+ 'aAccessTime': 0x0020,
+ 'aModifyTime': 0x0040,
+ 'uFileSize': 0x0080,
+ 'ustrFileName': 0x0100,
+ 'ustrFileURL': 0x0200,
+ 'ustrLinkTargetURL': 0x0400}
+
+valid_fields = self.val['uValidFields']
+if valid_fields mask_for_field[field]:
+return self.val[field]
+else:
+return None
+
printer = None
def build_pretty_printers():
@@ -109,6 +173,7 @@ def build_pretty_printers():
# other stuff
printer.add('rtl::Reference', RtlReferencePrinter)
+printer.add('_oslFileStatus', OslFileStatusPrinter)
return printer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sdext/Configuration_minimizer.mk sdext/Configuration_presenter.mk solenv/gbuild tail_build/prj
sdext/Configuration_minimizer.mk |2 +- sdext/Configuration_presenter.mk |2 +- solenv/gbuild/AllLangResTarget.mk |3 ++- solenv/gbuild/ComponentTarget.mk |7 --- solenv/gbuild/Configuration.mk| 34 ++ solenv/gbuild/Executable.mk |2 +- solenv/gbuild/Package.mk | 19 ++- solenv/gbuild/Rdb.mk |8 +--- solenv/gbuild/UnoApiTarget.mk |9 + solenv/gbuild/Zip.mk |2 +- tail_build/prj/build.lst |2 +- 11 files changed, 57 insertions(+), 33 deletions(-) New commits: commit 294b86e3dbbdb9b136cb17a51687f4e2762711cf Author: Michael Stahl mst...@redhat.com Date: Thu Mar 8 09:55:50 2012 +0100 gbuild: fix mkdir optimization with make 3.81 The problem is that make 3.81 does not match pattern rules whose target ends with '/' against directories. (regression from 408822b54724f8170a1296ddd67e50d8291c8ee1, 90491a073c5b5faee782ad5eab63276fda2342e6) So use a fake file .dir in the respective directory, and try not to spawn unnecessary mkdir processes by checking for existence via realpath. This is all quite ugly and should be reverted once support for make 3.81 is dropped. Also, fix a pre-existing problem of pattern rules with multiple targets that used to work by accident in Package.mk. diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 344f6d8..1df1fb1 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -356,7 +356,8 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target, $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1)) -$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))) +$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| \ + $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1)) diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index adec783..9eb0ea5 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -52,8 +52,9 @@ $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$ $(call gb_ComponentTarget_get_target,%) : $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.)) -$(call gb_ComponentTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir : + mkdir -p $(dir $@) $(call gb_ComponentTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$,$@) @@ -63,7 +64,7 @@ $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_outdir_target,$(1)) : \ $(call gb_ComponentTarget_get_target,$(1)) \ - | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))) + | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index c16bc13..ffced85 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -101,8 +101,11 @@ $(call gb_XcsTarget_get_clean_target,%) : rm -f $(call gb_XcsTarget_get_target,$*) \ $(call gb_XcsTarget_get_outdir_target,$(XCSFILE))) -$(call gb_XcsTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir : + $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) +$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir : + $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcsTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -145,8 +148,11 @@ $(call gb_XcuDataTarget_get_clean_target,%) : rm -f $(call gb_XcuDataTarget_get_target,$*) \ $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE))) -$(call gb_XcuDataTarget_get_outdir_target,%/) : - mkdir -p $@ +# the .dir is for make 3.81, which ignores trailing / +$(dir $(call
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 44 +--
solenv/inc/minor.mk |4 +--
2 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 59601189dba1ddc572a214cc752108568733eb7e
Author: Petr Mladek pmla...@suse.cz
Date: Thu Mar 8 10:20:57 2012 +0100
bump product version to 3.4.7-rc0, release number to 700
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index f34f689..852a226 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,8 +5,8 @@ Globals
variables
{
OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.5
- UREPACKAGEVERSION 3.4.5
+ OOOPACKAGEVERSION 3.4.7
+ UREPACKAGEVERSION 3.4.7
URELAYERVERSION 1
BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice3.4
@@ -57,12 +57,12 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.5
+ ABOUTBOXPRODUCTVERSION 3.4.7
BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.5
+ PACKAGEVERSION 3.4.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -125,12 +125,12 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.5
+ ABOUTBOXPRODUCTVERSION 3.4.7
BASEPRODUCTVERSION 3.4
UPDATEURL
http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL
http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -141,7 +141,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.5
+ PACKAGEVERSION 3.4.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -189,14 +189,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc0
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.5
+ ABOUTBOXPRODUCTVERSION 3.4.7
BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -211,7 +211,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.5
+ PACKAGEVERSION 3.4.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc1
+SHORT_PRODUCTEXTENSION rc0
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,11 +305,11 @@
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 26 ++---
1 file changed, 3 insertions(+), 23 deletions(-)
New commits:
commit 879325fcf7b9cbf9376bdd0260bbaa943234a654
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Mar 8 11:11:22 2012 +0100
rtftok: get rid of unnecessary lcl_getNumPr()
The more generic lcl_putNestedSprm() can be used instead.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ec01aac..82b1614 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -70,21 +70,6 @@ using rtl::OUStringToOString;
namespace writerfilter {
namespace rtftok {
-static RTFSprms lcl_getNumPr(std::stackRTFParserState aStates)
-{
-// insert the numpr sprm if necessary
-RTFValue::Pointer_t p =
aStates.top().aParagraphSprms.find(NS_ooxml::LN_CT_PPrBase_numPr);
-if (!p.get())
-{
-RTFSprms aAttributes;
-RTFSprms aSprms;
-RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
-
aStates.top().aParagraphSprms-push_back(make_pair(NS_ooxml::LN_CT_PPrBase_numPr,
pValue));
-p = aStates.top().aParagraphSprms.find(NS_ooxml::LN_CT_PPrBase_numPr);
-}
-return p-getSprms();
-}
-
static Id lcl_getParagraphBorder(sal_uInt32 nIndex)
{
static const Id aBorderIds[] =
@@ -2337,10 +2322,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
}
break;
case RTF_ILVL:
-{
-RTFSprms rSprms = lcl_getNumPr(m_aStates);
-rSprms-push_back(make_pair(NS_sprm::LN_PIlvl, pIntValue));
-}
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_numPr, NS_sprm::LN_PIlvl, pIntValue);
+break;
case RTF_LISTTEMPLATEID:
// This one is not referenced anywhere, so it's pointless to store
it at the moment.
break;
@@ -2357,10 +2340,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
if (m_aStates.top().nDestinationState ==
DESTINATION_LISTOVERRIDEENTRY)
m_aStates.top().aTableAttributes-push_back(make_pair(NS_rtf::LN_LSID,
pIntValue));
else
-{
-RTFSprms rSprms = lcl_getNumPr(m_aStates);
-rSprms-push_back(make_pair(NS_sprm::LN_PIlfo, pIntValue));
-}
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_sprm::LN_PIlfo, pIntValue);
}
break;
case RTF_UC:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/writer/writer.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 14ca52086ba3cdba0f767f69f9de9fa5fb9e5668
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 8 11:44:02 2012 +0200
Fix bug in commit ad9960ffeb25f31ce4b1f819f909f1eb9ad6d7dd
My previous patch converting SvPtrarr usage to std::vector had a bug,
(spotted by Ivan timofeev@gmail.com) where it called multimap.find
instead of multimap.equal_range.
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 751743c..c0f780e 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -464,17 +464,18 @@ sal_uInt16 Writer::GetBookmarks(const SwCntntNode rNd,
xub_StrLen nStt,
OSL_ENSURE( rArr.empty(), es sind noch Eintraege vorhanden );
sal_uLong nNd = rNd.GetIndex();
-SwBookmarkNodeTable::const_iterator it = m_pImpl-aBkmkNodePos.find( nNd );
-if( it != m_pImpl-aBkmkNodePos.end() )
+std::pairSwBookmarkNodeTable::const_iterator,
SwBookmarkNodeTable::const_iterator aIterPair
+= m_pImpl-aBkmkNodePos.equal_range( nNd );
+if( aIterPair.first != aIterPair.second )
{
// there exist some bookmarks, search now all which is in the range
if( !nStt nEnd == rNd.Len() )
// all
-for( ; it != m_pImpl-aBkmkNodePos.end(); ++it )
+for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it
!= aIterPair.second; ++it )
rArr.push_back( it-second );
else
{
-for( ; it != m_pImpl-aBkmkNodePos.end(); ++it )
+for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it
!= aIterPair.second; ++it )
{
const ::sw::mark::IMark rBkmk = *(it-second);
xub_StrLen nCntnt;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - qadevOOo/tests
qadevOOo/tests/java/ifc/beans/_XPropertySet.java |4
1 file changed, 4 insertions(+)
New commits:
commit b4931cf9e7d5a4bcda7c52c46d6c4f5e32420396
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 6 23:51:54 2012 +0100
qadevOOo: _XPropertySet.java: fix unrealistic expectations:
We can't assume that when setting properties whose semantics we don't
know to random values in an arbitrary order, a non-changing value
indicates any kind of error.
The only real error this test can detect is if setting a property
crashes.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 07efacb..09e933f 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -319,11 +319,15 @@ public class _XPropertySet extends MultiMethodTest {
property '+ propertyName+');
e.printStackTrace(log);
} // end of try-catch
+/* this is stupid: we can't set properties whose semantics we
+ * don't know to random values in an arbitrary order and
+ * expect that to actually work.
if( gValue.equals(sValue) )
{
log.println(setting property '+ propertyName+' failed);
error = true;
}
+*/
}
tRes.tested(setPropertyValue(),!error);
} //endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in
config_host.mk.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6b84f0d0c408cbe8cac1509b5d9807ccc9634186 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Mar 8 13:02:49 2012 +0100 Export the LCMS2_CFLAGS and LCMS2_LIBS diff --git a/config_host.mk.in b/config_host.mk.in index f0ea883..2839b5c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -236,6 +236,8 @@ export KDE_GLIB_LIBS=@KDE_GLIB_LIBS@ export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@ export KDE_LIBS=@KDE_LIBS@ export L10N_MODULE=@L10N_MODULE@ +export LCMS2_CFLAGS=@LCMS2_CFLAGS@ +export LCMS2_LIBS=@LCMS2_LIBS@ export LFS_CFLAGS=@LFS_CFLAGS@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source sdext/source
sc/source/ui/docshell/docfunc.cxx |5 -
sdext/source/pdfimport/test/tests.cxx | 124 +-
2 files changed, 67 insertions(+), 62 deletions(-)
New commits:
commit ccfbb8647503e9e2531c4fc1fb03354a82401e3d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Mar 8 13:16:07 2012 +0100
use better assertion macros in pdfimport unit test
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 78d0a5e..c4d7fc5 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -81,6 +81,7 @@
#include boost/unordered_map.hpp
#include cassert
+#include rtl/oustringostreaminserter.hxx
using namespace ::pdfparse;
using namespace ::pdfi;
@@ -88,6 +89,14 @@ using namespace ::com::sun::star;
namespace
{
+
+template typename charT, typename traits std::basic_ostreamcharT,
traits
+operator (
+std::basic_ostreamcharT, traits stream, rtl::OString const
string)
+{
+return stream string.getStr();
+}
+
class TestSink : public ContentSink
{
public:
@@ -109,17 +118,16 @@ namespace
~TestSink()
{
-CPPUNIT_ASSERT_MESSAGE( A4 page size (in 100th of points),
-m_aPageSize.Width == 79400
m_aPageSize.Height == 59500 );
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Width, m_aPageSize.Width, 79400, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Height , m_aPageSize.Height, 59500, 0.001 );
CPPUNIT_ASSERT_MESSAGE( endPage() called, m_bPageEnded );
-CPPUNIT_ASSERT_MESSAGE( Num pages equal one, m_nNumPages == 1 );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
1 );
CPPUNIT_ASSERT_MESSAGE( Correct hyperlink bounding box,
rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 )
rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0)
rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7)
rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
-CPPUNIT_ASSERT_MESSAGE( Correct hyperlink URI,
-m_aURI ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(http://download.openoffice.org/;))
);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Correct hyperlink URI, m_aURI,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(http://download.openoffice.org/;))
);
const char* sText = \n \nThis is a testtext\nNew paragraph,\nnew
line\n
Hyperlink, this is\n?\nThis is more text\noutline
mode\n?\nNew paragraph\n;
@@ -127,9 +135,9 @@ namespace
m_aTextOut.makeStringAndClear().convertToString( aTmp,
RTL_TEXTENCODING_ASCII_US,
OUSTRING_TO_OSTRING_CVTFLAGS );
-CPPUNIT_ASSERT_MESSAGE( Imported text is \This is a testtext New
paragraph, new line
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Imported text is \This is a
testtext New paragraph, new line
Hyperlink, this is * This is more text
outline mode * New paragraph\,
-sText == aTmp );
+rtl::OString(sText), aTmp );
CPPUNIT_ASSERT_MESSAGE( red circle seen in input,
m_bRedCircleSeen );
CPPUNIT_ASSERT_MESSAGE( green stroke seen in input,
m_bGreenStrokeSeen );
@@ -185,7 +193,7 @@ namespace
GraphicsContext rContext( getCurrentContext() );
if( dashes.getLength() )
comphelper::sequenceToContainer(rContext.DashArray,dashes);
-CPPUNIT_ASSERT_MESSAGE( line dashing start offset, start == 0.0
);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( line dashing start offset,
start, 0.0, 0.1 );
}
virtual void setFlatness( double nFlatness )
@@ -250,11 +258,10 @@ namespace
if( rContext.DashArray.empty() )
{
-CPPUNIT_ASSERT_MESSAGE( Line color is green,
-rContext.LineColor.Alpha == 1.0
-rContext.LineColor.Red == 0.0
-rContext.LineColor.Green == 1.0
-rContext.LineColor.Blue == 0.0 );
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Alpha, 1.0, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Blue, 0.0, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
[Libreoffice-commits] .: binfilter/bf_starmath binfilter/inc
binfilter/bf_starmath/source/starmath_register.cxx |2 ++
binfilter/inc/bf_sfx2/objsh.hxx|6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4a2109f5e8cc415ca2a33a6da338be65a5b0ed13
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 12:31:02 2012 +
fix build error
diff --git a/binfilter/bf_starmath/source/starmath_register.cxx
b/binfilter/bf_starmath/source/starmath_register.cxx
index 1f32129..d2461ed 100644
--- a/binfilter/bf_starmath/source/starmath_register.cxx
+++ b/binfilter/bf_starmath/source/starmath_register.cxx
@@ -35,6 +35,8 @@
#include cppuhelper/factory.hxx
+#include tools/table.hxx
+
namespace binfilter {
using namespace ::rtl;
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 9d39df6..2aacaf0 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -43,11 +43,12 @@
#include vcl/timer.hxx
#endif
#include bf_svtools/poolitem.hxx
-#include bf_so3/so2defs.hxx
#include bf_so3/persist.hxx
+#include bf_so3/so2defs.hxx
+#include bf_so3/svstor.hxx
+#include tools/table.hxx
#include vcl/timer.hxx
#include vcl/bitmap.hxx
-#include bf_so3/svstor.hxx
#include rsc/rscsfx.hxx
@@ -119,7 +120,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
#define SFX_LOADED_IMAGES 2
#define SFX_LOADED_ALL 3
-
//
DECLARE_TABLE( SfxEventListTable, String* )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/onlineupdate/file_onlineupdate.scp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 5ad30d4a01c27a4660b99de0c59a75c92792d1f0 Author: Andras Timar ati...@suse.com Date: Thu Mar 8 13:50:28 2012 +0100 fix library name Signed-off-by: Andras Timar ati...@suse.com diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 8cca574..abfb76c 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -29,9 +29,9 @@ File gid_File_Lib_Updchk BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; - Name = updchk.uno.dll; +Styles = (PACKED); +Dir = gid_Brand_Dir_Program; +Name = SPECIAL_COMPONENT_LIB_NAME(updchk.uno); ComponentCondition=ISCHECKFORPRODUCTUPDATES=1; End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/unx/kde4/KDE4FilePicker.cxx |4 1 file changed, 4 insertions(+) New commits: commit ee67c55260ec7723c39606955ccdbd3e2934935a Author: David Tardon dtar...@redhat.com Date: Thu Mar 8 14:15:09 2012 +0100 yet another clash with macro name diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 269deee..8e8b3e8 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -60,6 +60,8 @@ #undef SETTINGS_MOUSE #define LO_SETTINGS_LOCALE SETTINGS_LOCALE #undef SETTINGS_LOCALE +#define LO_SETTINGS_STYLE SETTINGS_STYLE +#undef SETTINGS_STYLE #include kfiledialog.h #include kwindowsystem.h @@ -77,6 +79,8 @@ #undef LO_SETTINGS_MOUSE #define SETTINGS_LOCALE LO_SETTINGS_LOCALE #undef LO_SETTINGS_LOCALE +#define SETTINGS_STYLE LO_SETTINGS_STYLE +#undef LO_SETTINGS_STYLE using namespace ::com::sun::star; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binaryurp/source
binaryurp/source/bridge.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 672ad9493a484a606df2f546caf98a7a7355fe31
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 8 14:22:25 2012 +0100
Clarifying comment added
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index fec485d..7718c53 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -242,6 +242,12 @@ void Bridge::start() {
writer_-launch();
reader_.set(new Reader(this));
reader_-launch();
+// it is important to call reader_-launch() last here; both
+// Writer::execute and Reader::execute can call Bridge::terminate, but
+// Writer::execute is initially blocked in unblocked_.wait() until
+// Reader::execute has called bridge_-sendRequestChangeRequest(), so
+// effectively only reader_-launch() can lead to an early call to
+// Bridge::terminate
}
void Bridge::terminate() {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/qa sw/source
sw/qa/core/data/ww8/pass/fdo40686-1.doc |binary
sw/source/filter/ww8/ww8par6.cxx| 15 +--
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit dbf4c479ae43cdd6ee2f8b9b42452b1a8c46765b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 13:00:45 2012 +
Resolves: fdo#40686 dyaLinePitch only valid between [1-31680]
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/sw/qa/core/data/ww8/pass/fdo40686-1.doc
b/sw/qa/core/data/ww8/pass/fdo40686-1.doc
new file mode 100644
index 000..bb0fd59
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/fdo40686-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 845a381..2f7a956 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -270,14 +270,11 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt rFmt,
const wwSection rSection)
if (eType != GRID_NONE)
rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, false);
- //force to set document as standard page mode
+//force to set document as standard page mode
sal_Bool bSquaredMode = sal_False;
rDoc.SetDefaultPageMode( bSquaredMode );
aGrid.SetSquaredMode( bSquaredMode );
-//sep.dyaLinePitch
-sal_Int32 nLinePitch = rSection.maSep.dyaLinePitch;
-
//Get the size of word's default styles font
sal_uInt32 nCharWidth=240;
for (sal_uInt16 nI = 0; nI pStyles-GetCount(); ++nI)
@@ -306,8 +303,14 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt rFmt,
const wwSection rSection)
}
aGrid.SetBaseWidth( writer_castsal_uInt16(nCharWidth));
-aGrid.SetLines(writer_castsal_uInt16(nTextareaHeight/nLinePitch));
-aGrid.SetBaseHeight(writer_castsal_uInt16(nLinePitch));
+
+//sep.dyaLinePitch
+sal_Int32 nLinePitch = rSection.maSep.dyaLinePitch;
+if (nLinePitch = 1 nLinePitch = 31680)
+{
+aGrid.SetLines(writer_castsal_uInt16(nTextareaHeight/nLinePitch));
+aGrid.SetBaseHeight(writer_castsal_uInt16(nLinePitch));
+}
sal_Int32 nRubyHeight = 0;
aGrid.SetRubyHeight(writer_castsal_uInt16(nRubyHeight));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/swg/SwXMLTextBlocks.cxx | 33 -
1 file changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 0c075735344122c1c016289951f2bf832cec69a7
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Mar 8 13:47:50 2012 +
Fixed crash when renaming AutoText
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx
b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 1ee655a..ba3b00a 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -218,7 +218,13 @@ sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const
String rNewShort, con
String aNewStreamName( aPackageName ); aNewStreamName += sExt;
xRoot = xBlkRoot-openStorageElement( aOldName,
embed::ElementModes::READWRITE );
-xRoot-renameElement ( aOldStreamName, aNewStreamName );
+try
+{
+xRoot-renameElement ( aOldStreamName, aNewStreamName );
+}
+catch(const container::ElementExistException)
+{
+}
uno::Reference embed::XTransactedObject xTrans( xRoot,
uno::UNO_QUERY );
if ( xTrans.is() )
xTrans-commit();
commit dbe20175fed8e82bec3578ae3af800dac7bc45f4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 13:37:40 2012 +
Resolves: fdo#46939 don't rename autotext when source and dest are the same
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx
b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 5a19bc6..1ee655a 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -208,22 +208,23 @@ sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const
String rNewShort, con
String aOldName (aNames[ nIdx ]-aPackageName);
aShort = rNewShort;
GeneratePackageName( aShort, aPackageName );
-if (IsOnlyTextBlock ( nIdx ) )
-{
-String sExt( String::CreateFromAscii( .xml ));
-String aOldStreamName( aOldName ); aOldStreamName += sExt;
-String aNewStreamName( aPackageName ); aNewStreamName += sExt;
-
-xRoot = xBlkRoot-openStorageElement( aOldName,
embed::ElementModes::READWRITE );
-xRoot-renameElement ( aOldStreamName, aNewStreamName );
-uno::Reference embed::XTransactedObject xTrans( xRoot,
uno::UNO_QUERY );
-if ( xTrans.is() )
-xTrans-commit();
-xRoot = 0;
-}
if(aOldName != aPackageName)
{
+if (IsOnlyTextBlock ( nIdx ) )
+{
+String sExt( String::CreateFromAscii( .xml ));
+String aOldStreamName( aOldName ); aOldStreamName += sExt;
+String aNewStreamName( aPackageName ); aNewStreamName += sExt;
+
+xRoot = xBlkRoot-openStorageElement( aOldName,
embed::ElementModes::READWRITE );
+xRoot-renameElement ( aOldStreamName, aNewStreamName );
+uno::Reference embed::XTransactedObject xTrans( xRoot,
uno::UNO_QUERY );
+if ( xTrans.is() )
+xTrans-commit();
+xRoot = 0;
+}
+
try
{
xBlkRoot-renameElement ( aOldName, aPackageName );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/doccomp.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 706cac767c90281b74fbc27a134b022d27e2ce21
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Thu Mar 8 14:52:14 2012 +0100
fdo#43424: Comparing empty document with attached one crashes LO
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 80c77c4..11c43f3 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1536,14 +1536,17 @@ void SwCompareData::ShowDelete( const CompareData
rData, sal_uLong nStt,
((SwCompareLine*)rData.GetLine( nEnd-1 ))-GetEndNode(), 1 );
sal_uInt16 nOffset = 0;
-const CompareLine* pLine;
-if( GetLineCount() == nInsPos )
+const CompareLine* pLine = 0;
+if( nInsPos = 1 )
{
-pLine = GetLine( nInsPos-1 );
-nOffset = 1;
+if( GetLineCount() == nInsPos )
+{
+pLine = GetLine( nInsPos-1 );
+nOffset = 1;
+}
+else
+pLine = GetLine( nInsPos );
}
-else
-pLine = GetLine( nInsPos );
const SwNode* pLineNd;
if( pLine )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/inc/SwXMLTextBlocks.hxx |4 +--
sw/source/core/inc/swblocks.hxx |6 ++---
sw/source/core/swg/SwXMLTextBlocks.cxx | 34 +---
sw/source/core/swg/SwXMLTextBlocks1.cxx |3 --
sw/source/core/swg/swblocks.cxx |4 +--
5 files changed, 27 insertions(+), 24 deletions(-)
New commits:
commit 1fad074f43e3301420900918881ad1a8b0bc8687
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 14:02:19 2012 +
convert to OUString to I can use SAL_WARN
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx
b/sw/source/core/inc/SwXMLTextBlocks.hxx
index c87b08d..c7cf91e 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -47,7 +47,7 @@ protected:
sal_Bool bBlock;
SfxObjectShellRef xDocShellRef;
sal_uInt16 nFlags;
-String aPackageName;
+rtl::OUString aPackageName;
SfxMediumRef xMedium;
void ReadInfo();
@@ -63,7 +63,7 @@ public:
SwXMLTextBlocks( const com::sun::star::uno::Reference
com::sun::star::embed::XStorage , const String rFile );
void AddName( const String, const String, const String, sal_Bool
bOnlyTxt = sal_False );
virtual void AddName( const String, const String, sal_Bool bOnlyTxt =
sal_False );
-void GeneratePackageName ( const String rShort, String rPackageName );
+rtl::OUString GeneratePackageName ( const String rShort );
virtual ~SwXMLTextBlocks();
//virtual sal_Bool IsOld() const;
virtual sal_uLong Delete( sal_uInt16 );
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 9a4d2f3..88d72ab 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -45,12 +45,12 @@ class SwBlockName
{
friend class SwImpBlocks;
friend class Sw2TextBlocks;
-sal_uInt16 nHashS, nHashL; // Hash-Codes zum Checken
+sal_uInt16 nHashS, nHashL; // Hash-Codes zum Checken
long nPos;// Dateiposition (SW2-Format)
public:
String aShort; // Short name
String aLong; // Long name
-String aPackageName;// Package name
+rtl::OUString aPackageName; // Package name
sal_Bool bIsOnlyTxtFlagInit : 1;// ist das Flag gueltig?
sal_Bool bIsOnlyTxt : 1;// unformatted text
sal_Bool bInPutMuchBlocks : 1; // put serveral block entries
@@ -108,7 +108,7 @@ public:
sal_uInt16 GetLongIndex( const String ) const; //Index fuer Langnamen
ermitteln
const String GetShortName( sal_uInt16 ) const; // Kurzname fuer Index
zurueck
const String GetLongName( sal_uInt16 ) const; // Langname fuer Index
zurueck
-const String GetPackageName( sal_uInt16 ) const; // Langname fuer Index
zurueck
+rtl::OUString GetPackageName( sal_uInt16 ) const; // Langname fuer Index
zurueck
const String GetFileName() const {return aFile;} // phys. Dateinamen
liefern
void SetName( const String rName ) // logic name
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx
b/sw/source/core/swg/SwXMLTextBlocks.cxx
index ba3b00a..6f786b0 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -29,9 +29,10 @@
#include com/sun/star/embed/ElementModes.hpp
#include com/sun/star/embed/XTransactedObject.hpp
-#include tools/urlobj.hxx
+#include rtl/oustringostreaminserter.hxx
#include sot/stg.hxx
#include sfx2/docfile.hxx
+#include tools/urlobj.hxx
#include unotools/localfilehelper.hxx
#include unotools/ucbstreamhelper.hxx
@@ -156,7 +157,7 @@ void SwXMLTextBlocks::AddName( const String rShort, const
String rLong, sal_Bo
if( nIdx != (sal_uInt16) -1 )
aNames.DeleteAndDestroy( nIdx );
-GeneratePackageName( rShort, aPackageName );
+aPackageName = GeneratePackageName( rShort );
pNew = new SwBlockName( rShort, rLong, aPackageName );
pNew-bIsOnlyTxtFlagInit = sal_True;
@@ -205,17 +206,17 @@ sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const
String rNewShort, con
OSL_ENSURE( xBlkRoot.is(), No storage set );
if(!xBlkRoot.is())
return 0;
-String aOldName (aNames[ nIdx ]-aPackageName);
+rtl::OUString aOldName (aNames[ nIdx ]-aPackageName);
aShort = rNewShort;
-GeneratePackageName( aShort, aPackageName );
+aPackageName = GeneratePackageName( aShort );
if(aOldName != aPackageName)
{
if (IsOnlyTextBlock ( nIdx ) )
{
-String sExt( String::CreateFromAscii( .xml ));
-String aOldStreamName( aOldName ); aOldStreamName += sExt;
-String aNewStreamName( aPackageName ); aNewStreamName += sExt;
+rtl::OUString sExt(.xml);
+rtl::OUString aOldStreamName( aOldName ); aOldStreamName += sExt;
+rtl::OUString aNewStreamName( aPackageName );
[Libreoffice-commits] .: cui/source sc/source sfx2/source svl/inc svl/source svtools/inc svtools/source svx/source sw/source
cui/source/inc/macroass.hxx|2
cui/source/tabpages/macroass.cxx |7 --
sc/source/ui/drawfunc/drawsh.cxx |4 -
sfx2/source/bastyp/sfxhtml.cxx |9 +-
svl/inc/svl/macitem.hxx| 44
svl/source/items/macitem.cxx | 126 -
svtools/inc/svtools/imapobj.hxx|4 -
svtools/source/svhtml/htmlout.cxx |2
svtools/source/uno/unoevent.cxx|5 -
svx/source/items/hlnkitem.cxx | 63 ++
sw/source/core/txtnode/fmtatr2.cxx | 29 +---
sw/source/filter/html/htmlatr.cxx |2
sw/source/filter/html/htmlbas.cxx |7 +-
sw/source/filter/html/htmlfly.cxx |6 -
sw/source/filter/html/htmlform.cxx | 24 ++-
sw/source/filter/html/htmlgrin.cxx |7 --
sw/source/ui/chrdlg/chardlg.cxx|2
sw/source/ui/dochdl/gloshdl.cxx|4 -
sw/source/ui/shells/textfld.cxx|2
sw/source/ui/uno/unoatxt.cxx |3
20 files changed, 166 insertions(+), 186 deletions(-)
New commits:
commit 4b4fb33c606fd068e024669efcbd7ad2aefdaacd
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 8 15:53:57 2012 +0200
Convert from tools/table.hxx to std::map in SvxMacroTableDtor
In this case, we also convert from storing pointers to storing
the items directly because SvxMacroTableDtor completely controls
the lifecycle of the SvxMacro objects it contains.
Also add an operator== to SvxMacroTableDtor and remove the out-of-line
implementations of equals from two other places.
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 849ac45..bca7bf4 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -100,7 +100,7 @@ inline void _SfxMacroTabPage::SetMacroTbl( const
SvxMacroTableDtor rTbl )
inline void _SfxMacroTabPage::ClearMacroTbl()
{
-aTbl.DelDtor();
+aTbl.clear();
}
class SfxMacroTabPage : public _SfxMacroTabPage
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 3128df1..62f38c2 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -329,8 +329,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl,
PushButton*, pBtn )
// aus der Tabelle entfernen
sal_uInt16 nEvent = (sal_uInt16)(sal_uLong)pE-GetUserData();
-SvxMacro *pRemoveMacro = pThis-aTbl.Remove( nEvent );
-delete pRemoveMacro;
+pThis-aTbl.Erase( nEvent );
String sScriptURI;
if( bAssEnabled )
@@ -339,13 +338,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl,
PushButton*, pBtn )
if( sScriptURI.CompareToAscii( vnd.sun.star.script:, 20 ) ==
COMPARE_EQUAL )
{
pThis-aTbl.Insert(
-nEvent, new SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_SF ) ) );
+nEvent, SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_SF ) ) );
}
else
{
OSL_ENSURE( false, _SfxMacroTabPage::AssignDeleteHdl_Impl: this
branch is *not* dead? (out of interest: tell fs, please!) );
pThis-aTbl.Insert(
-nEvent, new SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_STARBASIC ) ) );
+nEvent, SvxMacro( sScriptURI, String::CreateFromAscii(
SVX_MACRO_LANGUAGE_STARBASIC ) ) );
}
}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 61d20f1..1ab7def 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -309,7 +309,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj,
Window* pWin )
{
SvxMacroTableDtor aTab;
rtl::OUString sMacro = pInfo-GetMacro();
-aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, new SvxMacro(sMacro,
rtl::OUString()));
+aTab.Insert(SFX_EVENT_MOUSECLICK_OBJECT, SvxMacro(sMacro,
rtl::OUString()));
aItem.SetMacroTable( aTab );
}
@@ -334,7 +334,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj,
Window* pWin )
if( SFX_ITEM_SET == pOutSet-GetItemState( SID_ATTR_MACROITEM, false,
pItem ))
{
rtl::OUString sMacro;
-SvxMacro* pMacro = ((SvxMacroItem*)pItem)-GetMacroTable().Get(
SFX_EVENT_MOUSECLICK_OBJECT );
+const SvxMacro* pMacro =
((SvxMacroItem*)pItem)-GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT );
if ( pMacro )
sMacro = pMacro-GetMacName();
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 2f3a7ad..6a3fee6 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -177,8 +177,7 @@ IMAPOBJ_SETEVENT:
if( sTmp.Len() )
{
sTmp = convertLineEnd(sTmp, GetSystemLineEnd());
-aMacroTbl.Insert( nEvent,
-new SvxMacro( sTmp, sEmpty, eScrpType ));
+
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Extension.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 74a6d7a135ca03c23eff8b360a748a8f964c92a3 Author: David Tardon dtar...@redhat.com Date: Thu Mar 8 15:39:26 2012 +0100 fix mis-merge diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 49186c1..9fcaa33 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -183,7 +183,7 @@ endef define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) -$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf +$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk | 39 --- solenv/gbuild/platform/NETBSD_SPARC_GCC.mk | 39 --- 2 files changed, 78 deletions(-) New commits: commit cf7e8929323f1d65cd7539d77215115dad8cfc1b Author: François Tigeot ftig...@wolfpond.org Date: Thu Mar 8 16:05:04 2012 +0100 Remove unused files. They were identical to NETBSD_INTEL_GCC.mk anyway diff --git a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk deleted file mode 100644 index a426e2f..000 --- a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara caol...@redhat.com -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -#please make generic modifications to unxgcc.mk - -gb_COMPILERDEFAULTOPTFLAGS := -O2 - -include $(GBUILDDIR)/platform/unxgcc.mk - -NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib - -gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) -gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH) - -# vim: set noet sw=4: diff --git a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk deleted file mode 100644 index a426e2f..000 --- a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara caol...@redhat.com -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -#please make generic modifications to unxgcc.mk - -gb_COMPILERDEFAULTOPTFLAGS := -O2 - -include $(GBUILDDIR)/platform/unxgcc.mk - -NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib - -gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) -gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH) - -# vim: set noet sw=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/NETBSD_INTEL_GCC.mk |2 +- solenv/gbuild/platform/NETBSD_X86_64_GCC.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 9ce48e3c881124b232f6689646122d7d6c4418ed Author: François Tigeot ftig...@wolfpond.org Date: Thu Mar 8 16:09:41 2012 +0100 Use the same CFLAGS on DragonFly and NetBSD. diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk index c0c31c9..6c79b78 100644 --- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk @@ -28,7 +28,7 @@ #please make generic modifications to unxgcc.mk gb_CPUDEFS := -DX86 -gb_COMPILERDEFAULTOPTFLAGS := -O2 +gb_COMPILERDEFAULTOPTFLAGS := -O -g include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk index a426e2f..d4288fa 100644 --- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk @@ -27,7 +27,7 @@ #please make generic modifications to unxgcc.mk -gb_COMPILERDEFAULTOPTFLAGS := -O2 +gb_COMPILERDEFAULTOPTFLAGS := -O -g include $(GBUILDDIR)/platform/unxgcc.mk ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/test/tests.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit bcdb2f161ec9b76ce65d608756c9aecddfe15ac2
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Mar 8 17:02:31 2012 +0200
Fix Windows compilation errors caused by int/sal_Int32 borkage
Unfortunately the unit test in question still fails on Windows,
though.
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index c4d7fc5..a98600c 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -121,7 +121,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Width, m_aPageSize.Width, 79400, 0.0001);
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Height , m_aPageSize.Height, 59500, 0.001 );
CPPUNIT_ASSERT_MESSAGE( endPage() called, m_bPageEnded );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
1 );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
(sal_Int32) 1 );
CPPUNIT_ASSERT_MESSAGE( Correct hyperlink bounding box,
rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 )
rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0)
@@ -306,7 +306,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 0,
rContext.Flatness, 1, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
}
virtual void fillPath( const
uno::Referencerendering::XPolyPolygon2D rPath )
@@ -325,7 +325,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 10,
rContext.Flatness, 10, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
}
virtual void eoFillPath( const
uno::Referencerendering::XPolyPolygon2D rPath )
@@ -344,7 +344,7 @@ namespace
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Flatness is 0,
rContext.Flatness, 1, 0.0001 );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Font id is 0,
-rContext.FontId, 0 );
+rContext.FontId, (sal_Int32) 0 );
const char* sExportString = m12050 49610c-4310
0-7800-3490-7800-7800 0-4300
3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490
7800-7790 7800z;
@@ -392,7 +392,7 @@ namespace
bool
/*bInvert*/ )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawMask received two properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawMask got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawMask got InputStream param,
@@ -402,7 +402,7 @@ namespace
virtual void drawImage(const uno::Sequencebeans::PropertyValue
xBitmap )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawImage received two properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawImage got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawImage got InputStream param,
@@ -413,7 +413,7 @@ namespace
const uno::Sequenceuno::Any
/*xMaskColors*/ )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawColorMaskedImage received two
properties,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
CPPUNIT_ASSERT_MESSAGE( drawColorMaskedImage got URL param,
xBitmap[0].Name.compareToAscii( URL ) ==
0 );
CPPUNIT_ASSERT_MESSAGE( drawColorMaskedImage got InputStream
param,
@@ -425,14 +425,14 @@ namespace
bool
/*bInvertMask*/)
{
CPPUNIT_ASSERT_EQUAL_MESSAGE( drawMaskedImage received two
properties #1,
-xBitmap.getLength(), 3 );
+xBitmap.getLength(), (sal_Int32) 3 );
[Libreoffice-commits] .: desktop/source
desktop/source/app/appinit.cxx |4 1 file changed, 4 deletions(-) New commits: commit 274b4272fa5e819e484935e9c65676d8d3f7ff3a Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Mar 8 02:10:49 2012 +0900 Removed dead define It died 10 years ago: 85c2755e16883d581db39b317b8c152b551da5ba diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 076899d..fe8618a 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -72,10 +72,6 @@ #include unotools/internaloptions.hxx -#define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) - -#define DESKTOP_TEMPDIRNAME soffice.tmp - using namespace desktop; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/fields/docufld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 49e07aa0de601dfa43820f3ff1d54d0c80054016
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 8 16:50:32 2012 +0100
docufld.cxx: Apple gcc can't find min(sal_Int32, int)
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 1f2e16e..79233a1 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2566,7 +2566,8 @@ const rtl::OUString SwCombinedCharField::GetPar1() const
void SwCombinedCharField::SetPar1(const rtl::OUString rStr)
{
-sCharacters = rStr.copy(0, std::min(rStr.getLength(),
MAX_COMBINED_CHARACTERS));
+sCharacters = rStr.copy(0, std::min(rStr.getLength(),
+static_castsal_Int32(MAX_COMBINED_CHARACTERS)));
}
bool SwCombinedCharField::QueryValue( uno::Any rAny,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c3d806be7d30a437607d924a4d33f13fe20dd1ba
Author: Noel Power noel.po...@novell.com
Date: Thu Mar 8 16:01:36 2012 +
fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index dc661d1..91d2be7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -366,7 +366,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false;
fi) \
- $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then
mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+$(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest
]; then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest
-outputresource:$(DLLTARGET)\;2; fi) \
+$(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ];
then mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+; exit $$RC)
endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source sw/source
sc/source/ui/app/inputhdl.cxx |4
sw/source/core/fields/docufld.cxx |3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2a48994be5501d2204793700f4a169ae455c6658
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 16:01:09 2012 +
different types in std::min on 32bit
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 79233a1..b146f55 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2566,8 +2566,7 @@ const rtl::OUString SwCombinedCharField::GetPar1() const
void SwCombinedCharField::SetPar1(const rtl::OUString rStr)
{
-sCharacters = rStr.copy(0, std::min(rStr.getLength(),
-static_castsal_Int32(MAX_COMBINED_CHARACTERS)));
+sCharacters = rStr.copy(0, std::minsal_Int32(rStr.getLength(),
MAX_COMBINED_CHARACTERS));
}
bool SwCombinedCharField::QueryValue( uno::Any rAny,
commit a3f1614c606629196ca71dc22dab3343b060dced
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 8 16:00:35 2012 +
Resolves: fdo#46923 uninitialized iterators are invalid
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d5a0868..29a40c5 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -722,7 +722,10 @@ void ScInputHandler::GetFormulaData()
if ( pFormulaData )
pFormulaData-clear();
else
+{
pFormulaData = new ScTypedCaseStrSet;
+miAutoPosFormula = pFormulaData-end();
+}
if( pFormulaDataPara )
pFormulaDataPara-clear();
@@ -1524,6 +1527,7 @@ void ScInputHandler::GetColData()
else
{
pColumnData = new ScTypedCaseStrSet;
+miAutoPosColumn = pColumnData-end();
}
std::vectorScTypedStrData aEntries;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/inc/frame.hxx|3 +-
sw/source/core/text/frmform.cxx | 49
sw/source/core/text/txtfly.cxx | 36 ++---
sw/source/core/text/xmldump.cxx | 44 +--
4 files changed, 52 insertions(+), 80 deletions(-)
New commits:
commit 1483c90ddc4a9f47b9a7da2d65da12f3e71cee60
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Mar 8 17:06:29 2012 +0100
sw: SwTxtFrm formatting, cleaned up useless debug code and translated
comments
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index e417e84..1d1d444 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1772,26 +1772,6 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
void SwTxtFrm::Format( const SwBorderAttrs * )
{
-#if OSL_DEBUG_LEVEL 1
-const XubString aXXX = GetTxtNode()-GetTxt();
-const SwTwips nDbgY = Frm().Top();
-(void)nDbgY;
-const SwPageFrm *pDbgPage = FindPageFrm();
-const MSHORT nDbgPageNr = pDbgPage-GetPhyPageNum();
-(void)nDbgPageNr;
-// Um zu gucken, ob es einen Ftn-Bereich gibt.
-const SwFrm *pDbgFtnCont = (const SwFrm*)(FindPageFrm()-FindFtnCont());
-(void)pDbgFtnCont;
-
-// nStopAt laesst sich vom CV bearbeiten.
-static MSHORT nStopAt = 0;
-if( nStopAt == GetFrmId() )
-{
-int i = GetFrmId();
-(void)i;
-}
-#endif
-
SWRECTFN( this )
CalcAdditionalFirstLineOffset();
@@ -1951,35 +1931,8 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
if ( pPara )
pPara-SetPrepMustFit( sal_False );
-#if OSL_DEBUG_LEVEL 1
-// Hier ein Instrumentarium, um ungewoehnlichen
Master/Follow-Kombinationen,
-// insbesondere bei Fussnoten, auf die Schliche zu kommen
-if( IsFollow() || GetFollow() )
-{
-SwTxtFrm *pTmpFrm = IsFollow() ? FindMaster() : this;
-const SwPageFrm *pTmpPage = pTmpFrm-FindPageFrm();
-MSHORT nPgNr = pTmpPage-GetPhyPageNum();
-MSHORT nLast;
-MSHORT nDummy = 0; // nur zum Breakpoint setzen
-while( pTmpFrm-GetFollow() )
-{
-pTmpFrm = pTmpFrm-GetFollow();
-nLast = nPgNr;
-pTmpPage = pTmpFrm-FindPageFrm();
-nPgNr = pTmpPage-GetPhyPageNum();
-if( nLast nPgNr )
-++nDummy; // schon fast eine Assertion wert
-else if( nLast == nPgNr )
-++nDummy; // bei Spalten voellig normal, aber sonst!?
-else if( nLast nPgNr - 1 )
-++nDummy; // kann schon mal temporaer vorkommen
-}
-}
-#endif
-
CalcBaseOfstForFly();
-// OD 2004-03-17 #i11860#
-_CalcHeightOfLastLine();
+_CalcHeightOfLastLine(); // #i11860#
}
/*
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 0fc70b8..a3b4630 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -2013,16 +2013,16 @@ void SwTxtFly::CalcLeftMargin( SwRect rFly,
(rFly.*fnRect-fnSetLeft)( nLeft );
}
-/*
- * SwTxtFly::FlyToRect()
- *
- * IN: dokumentglobal (rRect)
- * OUT: dokumentglobal (return-Wert)
- * Liefert zu einem SwFlyFrm das von ihm in Anspruch genommene Rechteck
- * unter Beruecksichtigung der eingestellten Attribute fuer den Abstand
- * zum Text zurueck.
- */
// #i68520#
+/**
+ Computes the bounds of an anchored object. This takes the
+ object wrapping and contour into account.
+
+ @param pAnchoredObj the object for which to get the bounds
+ @param rLine the bounds of the line to format
+
+ @return the flying object bounds
+ */
SwRect SwTxtFly::AnchoredObjToRect( const SwAnchoredObject* pAnchoredObj,
const SwRect rLine ) const
{
@@ -2044,15 +2044,15 @@ SwRect SwTxtFly::AnchoredObjToRect( const
SwAnchoredObject* pAnchoredObj,
// des Rahmens waechst.
SwAnchoredObjList::size_type nFlyPos = GetPos( pAnchoredObj );
-// Bei LEFT und RIGHT vergroessern wir das Rechteck.
-// Hier gibt es einige Probleme, wenn mehrere Frames zu sehen sind.
-// Zur Zeit wird nur der einfachste Fall angenommen:
-// LEFT bedeutet, dass der Text links vom Frame fliessen soll,
-// d.h. der Frame blaeht sich bis zum rechten Rand der Printarea
-// oder bis zum naechsten Frame auf.
-// Bei RIGHT ist es umgekehrt.
-// Ansonsten wird immer der eingestellte Abstand zwischen Text
-// und Frame aufaddiert.
+// LEFT and RIGHT, we grow the rectangle.
+// We have some problems, when several frames are to be seen.
+// At the moment, only the easier case is assumed:
+// + LEFT means that the text muss flaw
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/dinfdlg.cxx | 95 +
1 file changed, 60 insertions(+), 35 deletions(-)
New commits:
commit cc58c49eb492e4515e058ba1ce43378d976d9953
Author: William Gathoye will...@gathoye.be
Date: Tue Feb 28 11:55:29 2012 +0100
Fix controls size and position on the document information dialog
(cherry picked from commit 21d85dabe5d780571ad8ca39c8e6d30be90a0bf4)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index df7f963..e812d52 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -828,46 +828,71 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const
SfxItemSet rItemSet )
bHandleDelete ( sal_False )
{
-aNameED.SetAccessibleName(String(SfxResId(EDIT_FILE_NAME)));
+aNameED.SetAccessibleName( String( SfxResId( EDIT_FILE_NAME ) ) );
FreeResource();
-
ImplUpdateSignatures();
ImplCheckPasswordState();
-aDeleteBtn.SetClickHdl( LINK( this, SfxDocumentPage, DeleteHdl ) );
-aSignatureBtn.SetClickHdl( LINK( this, SfxDocumentPage, SignatureHdl ) );
aChangePassBtn.SetClickHdl( LINK( this, SfxDocumentPage, ChangePassHdl ) );
+aSignatureBtn.SetClickHdl( LINK( this, SfxDocumentPage, SignatureHdl ) );
+aDeleteBtn.SetClickHdl( LINK( this, SfxDocumentPage, DeleteHdl ) );
-// if the button text is too wide, then broaden it
-const long nOffset = 12;
-String sText = aSignatureBtn.GetText();
-long nTxtW = aSignatureBtn.GetTextWidth( sText );
-if ( sText.Search( '~' ) == STRING_NOTFOUND )
-nTxtW += nOffset;
-long nBtnW = aSignatureBtn.GetSizePixel().Width();
-if ( nTxtW = nBtnW )
-{
-long nDelta = Max( nTxtW - nBtnW, nOffset/3 );
-Size aNewSize = aSignatureBtn.GetSizePixel();
-aNewSize.Width() += nDelta;
-aSignatureBtn.SetSizePixel( aNewSize );
-aDeleteBtn.SetSizePixel( aNewSize );
-// and give them a new position
-Point aNewPos = aSignatureBtn.GetPosPixel();
-aNewPos.X() -= nDelta;
-aSignatureBtn.SetPosPixel( aNewPos );
-aNewPos = aDeleteBtn.GetPosPixel();
-aNewPos.X() -= nDelta;
-aDeleteBtn.SetPosPixel( aNewPos );
-
-aNewSize = aSignedValFt.GetSizePixel();
-aNewSize.Width() -= nDelta;
-aSignedValFt.SetSizePixel( aNewSize );
-aNewSize = aUseUserDataCB.GetSizePixel();
-aNewSize.Width() -= nDelta;
-aUseUserDataCB.SetSizePixel( aNewSize );
-}
-// See i96288
-// Check if the document signature command is enabled
+// Get the max size needed for the 'Change Password', 'Signature' and
'Delete' buttons
+// and set their size according to this max size to get perfect aligment
+long nTxtW = ( aChangePassBtn.GetTextWidth( aChangePassBtn.GetText() ) +
IMPL_EXTRA_BUTTON_WIDTH );
+nTxtW = Max( ( aSignatureBtn.GetTextWidth( aSignatureBtn.GetText() ) +
IMPL_EXTRA_BUTTON_WIDTH ), nTxtW);
+nTxtW = Max( ( aDeleteBtn.GetTextWidth( aDeleteBtn.GetText() ) +
IMPL_EXTRA_BUTTON_WIDTH ), nTxtW);
+
+// New size and position for the 'Change Password' button
+Size aNewSize = aChangePassBtn.GetSizePixel();
+long nDelta = nTxtW - aNewSize.Width();
+aNewSize.Width() = nTxtW;
+aChangePassBtn.SetSizePixel( aNewSize );
+Point aNewPos = aChangePassBtn.GetPosPixel();
+aNewPos.X() -= nDelta;
+aChangePassBtn.SetPosPixel( aNewPos );
+
+// Calculate the space between the bmp image and the 'Change password'
button
+nDelta = aNewPos.X() - IMPL_EXTRA_BUTTON_WIDTH / 2 \
+ - ( aBmp1.GetPosPixel().X() + aBmp1.GetSizePixel().Width() );
+
+// Reduces the filename field size if space size is not large enough
+aNewSize = aNameED.GetSizePixel();
+if ( nDelta - aNewSize.Width() IMPL_EXTRA_BUTTON_WIDTH )
+{
+aNewSize.Width() -= IMPL_EXTRA_BUTTON_WIDTH - ( nDelta -
aNewSize.Width() );
+aNameED.SetSizePixel( aNewSize );
+}
+
+// Centers the filename field in the space
+aNewPos = aNameED.GetPosPixel();
+nDelta -= aNewSize.Width();
+aNewPos.X() = aBmp1.GetPosPixel().X() + aBmp1.GetSizePixel().Width() +
nDelta / 2;
+aNameED.SetPosPixel( aNewPos );
+
+// New size and position for the 'Signature' button
+aNewSize = aSignatureBtn.GetSizePixel();
+nDelta = nTxtW - aNewSize.Width();
+aNewSize.Width() = nTxtW;
+aSignatureBtn.SetSizePixel( aNewSize );
+aNewPos = aSignatureBtn.GetPosPixel();
+aNewPos.X() -= nDelta;
+aSignatureBtn.SetPosPixel( aNewPos );
+
+// New size for the signature field
+aNewSize = aSignedValFt.GetSizePixel();
+aNewSize.Width() -= nDelta;
+aSignedValFt.SetSizePixel( aNewSize );
+
+// New size and position for the 'Delete' button
+aNewSize = aDeleteBtn.GetSizePixel();
+nDelta = nTxtW - aNewSize.Width();
+aNewSize.Width() = nTxtW;
+
[Libreoffice-commits] .: 2 commits - sdext/Extension_presenter.mk solenv/gbuild
sdext/Extension_presenter.mk |4 +--- solenv/gbuild/Extension.mk |2 +- 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit ac488d581a06fadb8866f6612595fe93b120c8fb Author: David Tardon dtar...@redhat.com Date: Thu Mar 8 19:01:24 2012 +0100 quick hack to fix building sdext with l10n diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 9fcaa33..3bfc6b5 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -183,7 +183,7 @@ endef define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) -$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf +$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3localize.sdf $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) commit de9f94dc8f3be28f11881e036ce0680988fb1666 Author: David Tardon dtar...@redhat.com Date: Thu Mar 8 19:00:43 2012 +0100 beware of excessive white spaces diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 0b228a2..3fa9806 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -147,9 +147,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,help/en-US/com.sun.Present $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \ )) -$(eval $(call gb_Extension_localize_help,presenter-screen,\ -help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,\ - $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp)) +$(eval $(call gb_Extension_localize_help,presenter-screen,help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp)) # this file is created by a custom target, but we depend on it: ensure # make knows about it ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc
svtools/inc/svtools/calendar.hxx | 164 ++- 1 file changed, 77 insertions(+), 87 deletions(-) New commits: commit 407ee0556c4859aeb640b1cf0aae710dac8ead73 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Thu Mar 8 19:01:46 2012 +0100 Translate German comments diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx index 94a7f5e..4d099d4 100644 --- a/svtools/inc/svtools/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -49,112 +49,106 @@ class ImplCFieldFloatWin; /* -Beschreibung +Description class Calendar -Diese Klasse erlaubt die Auswahl eines Datum. Der Datumsbereich der -angezeigt wird, ist der, der durch die Klasse Date vorgegeben ist. -Es werden soviele Monate angezeigt, wie die Ausgabeflaeche des -Controls vorgibt. Der Anwender kann zwischen den Monaten ueber ein -ContextMenu (Bei Click auf den Monatstitel) oder durch 2 ScrollButtons -zwischen den Monaten wechseln. +This class allows for the selection of a date. The displayed date range is +the one specified by the Date class. We display as many months as we have +space in the control. The user can switch between months using a ContextMenu +(clicking on the month's name) or via two ScrollButtons in-between the months. -- WinBits -WB_BORDER Um das Fenster wird ein Border gezeichnet. -WB_TABSTOP Tastatursteuerung ist moeglich. Der Focus wird -sich geholt, wenn mit der Maus in das -Control geklickt wird. -WB_QUICKHELPSHOWSDATEINFO DateInfo auch bei QuickInfo als BalloonHelp zeigen -WB_BOLDTEXT Formatiert wird nach fetten Texten und -DIB_BOLD wird bei AddDateInfo() ausgewertet -WB_FRAMEINFOFormatiert wird so, das Frame-Info angezeigt -werden kann und die FrameColor bei AddDateInfo() -ausgewertet wird -WB_RANGESELECT Es koennen mehrere Tage selektiert werden, die -jedoch alle zusammenhaengend sein muessen -WB_MULTISELECT Es koennen mehrere Tage selektiert werden -WB_WEEKNUMBER Es werden die Wochentage mit angezeigt +WB_BORDER We draw a border around the window. +WB_TABSTOP Keyboard control is possible. We get the focus, when +the user clicks in the Control. +WB_QUICKHELPSHOWSDATEINFO Show DateInfo as BallonHelp even if QuickInfo is enabled +WB_BOLDTEXT We format by bold texts and DIB_BOLD is evaluated by +AddDateInfo() +WB_FRAMEINFOWe format in a way, so that FrameInfo can be displayed +and the FrameColor is evaluated by AddDateInfo() +WB_RANGESELECT The user can select multiple days, which need to be +consecutive +WB_MULTISELECT The user can select multiple days +WB_WEEKNUMBER We also display the weekdays -- -Mit SetCurDate() / GetCurDate() wird das ausgewaehlte Datum gesetzt und -abgefragt. Wenn der Anwnder ein Datum selektiert hat, wird Select() -gerufen. Bei einem Doppelklick auf ein Datum wird DoubleClick() gerufen. +We set and get the selected date by SetCurDate()/GetCurDate(). +If the user selects a date Select() is called. If the user double clicks +DoubleClick() is called. -- -Mit CalcWindowSizePixel() kann die Groesse des Fensters in Pixel fuer -die Darstellung einer bestimmte Anzahl von Monaten berechnet werden. +CalcWindowSizePixel() calculates the window size in pixel that is needed +to display a certain number of months. -- -Mit SetSaturdayColor() kann eine spezielle Farbe fuer Sonnabende gesetzt -werden und mit SetSundayColor() eine fuer Sonntage. Mit AddDateInfo() -koennen Tage speziell gekennzeichnet werden. Dabei kann man einem -einzelnen Datum eine andere Farbe geben (zum Beispiel fuer Feiertage) -oder diese Umranden (zum Beispiel fuer Termine). Wenn beim Datum -kein Jahr angegeben wird, wird der Tag in jedem Jahr benutzt. Mit -AddDateInfo() kann auch jedem Datum ein Text mitgegeben werden, der -dann angezeigt wird, wenn Balloon-Hilfe an ist. Um nicht alle Jahre -mit entsprechenden Daten zu versorgen, wird der RequestDateInfo()- -Handler gerufen, wenn ein neues Jahr angezeigt wird. Es kann dann -im Handler mit GetRequestYear() das Jahr abgefragt werden. +SetSaturdayColor() and SetSundayColor() set a special color for Saturdays +and Sundays. +AddDateInfo()
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/transporttypes.hxx | 15 +--
1 file changed, 1 insertion(+), 14 deletions(-)
New commits:
commit c361ef86504e79a1e1b56fa3a7eba2f893386e2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 8 20:39:35 2012 +0100
Compiler-generated code is just fine
...now that member is Sequence instead of pointer to Sequence.
diff --git a/xmloff/source/chart/transporttypes.hxx
b/xmloff/source/chart/transporttypes.hxx
index cb03cbc..7ecf086 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -50,21 +50,8 @@ struct SchXMLCell
SchXMLCellType eType;
rtl::OUString aRangeId;
-SchXMLCell() : aComplexString(), fValue( 0.0 ), eType(
SCH_CELL_TYPE_UNKNOWN )
+SchXMLCell(): fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN )
{}
-
-SchXMLCell( const SchXMLCell rOther )
-: aString( rOther.aString )
-, aComplexString( rOther.aComplexString )
-, fValue( rOther.fValue )
-, eType( rOther.eType )
-, aRangeId( rOther.aRangeId )
-{}
-
-~SchXMLCell()
-{
-
-}
};
struct SchXMLTable
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - configure.in Makefile scp2/source sw/CppunitTest_sw_macros_test.mk
Makefile |6 -- configure.in |3 +++ scp2/source/ooo/file_library_ooo.scp | 11 +++ scp2/source/ooo/shortcut_ooo.scp |4 sw/CppunitTest_sw_macros_test.mk |2 +- 5 files changed, 23 insertions(+), 3 deletions(-) New commits: commit 03c6bfff92b10fc9f8ab82dcea1303dfe763f94c Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 8 11:52:10 2012 +0200 The instsetoo_native part is unnecessary when doing dev-install diff --git a/Makefile b/Makefile index 905829b..84d8c46 100644 --- a/Makefile +++ b/Makefile @@ -389,7 +389,7 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # # Build # -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) # We must get the headers from vbahelper delivered because # as we don't link to any libs from there they won't otherwise be, or @@ -404,6 +404,8 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) endif cd packimages unset MAKEFLAGS \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) + +build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native unset MAKEFLAGS $(SOLARENV)/bin/build.pl else @@ -426,7 +428,7 @@ install: echo Installation finished, you can now execute: \ echo $(INSTALLDIR)/program/soffice -dev-install: build +dev-install: build-packimages @rm -rf $(OUTDIR)/installation @mkdir $(OUTDIR)/installation ifeq ($(DISABLE_LINKOO),TRUE) commit 67381d234f4ce73db5b4f5cdaadb06c2b602788e Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 14:32:29 2012 +0200 Look for SCRIPTING in BUILD_TYPE diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 00d092a..a9a0060 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ $(call gb_CppunitTest_get_target,sw_macros_test) : \ $(call gb_Library_get_target,localedata_en) \ $(call gb_Library_get_target,msword) \ -$(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \ +$(if $(filter SCRIPTING,$(BUILD_TYPE)),$(call gb_Library_get_target,vbaswobj)) \ # vim: set noet sw=4 ts=4: commit 37a6cf755a45c5c624f4b4747d9c5a550d370924 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:58:37 2012 +0200 Check SOLAR_JAVA for gid_Shortcut_Lib_Hsqldb_2 diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 9f400af..a70c225 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -80,6 +80,8 @@ End #ifdef MACOSX +#ifdef SOLAR_JAVA + Shortcut gid_Shortcut_Lib_Hsqldb_2 FileID = gid_File_Lib_Hsqldb_2; Dir = SCP2_OOO_BIN_DIR; @@ -87,6 +89,8 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2 Styles = (NETWORK, RELATIVE); End +#endif + Shortcut gid_Shortcut_Lib_Libcroco FileID = gid_File_Lib_Libcroco; Dir = SCP2_OOO_BIN_DIR; commit c3fe8e2fd53ea37ce3e1d8fa583c80795991f550 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:57:46 2012 +0200 Obey DISABLE_SCRIPTING diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fe08906..716f590 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -39,6 +39,8 @@ End STD_LIB_FILE( gid_File_Lib_Ado, ado) #endif +#ifndef DISABLE_SCRIPTING + STD_LIB_FILE( gid_File_Lib_Basctl, basctl) File gid_File_Lib_Basprov @@ -63,6 +65,8 @@ File gid_File_Lib_Vbaevent #endif End +#endif + STD_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 @@ -309,6 +313,8 @@ File gid_File_Lib_Textconv_Dict Styles = (PACKED); End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Dlgprov LIB_FILE_BODY; Styles = (PACKED); @@ -320,6 +326,8 @@ File gid_File_Lib_Dlgprov #endif End +#endif + File gid_File_Lib_Stringresource LIB_FILE_BODY; Styles = (PACKED); @@ -331,6 +339,8 @@ File gid_File_Lib_Stringresource #endif End +#ifndef DISABLE_SCRIPTING + File gid_File_Lib_Vbaobj LIB_FILE_BODY; Styles = (PACKED); @@ -375,6 +385,7 @@ File gid_File_Lib_Vbahelper #endif End +#endif #ifdef WNT commit 8db978d3fa7916462fc7e6232532336e3a602e40 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 13:57:06 2012 +0200 Add DISABLE_DBCONNECTIVITY and DISABLE_SCRIPTING to SCPDEFS when needed diff --git a/configure.in b/configure.in index 973a978..d9f8741 100644 --- a/configure.in +++ b/configure.in @@ -2056,6 +2056,7 @@ if test $enable_database_connectivity = yes; then BUILD_TYPE=$BUILD_TYPE DBCONNECTIVITY else DISABLE_DBCONNECTIVITY='TRUE' +SCPDEFS=$SCPDEFS -DDISABLE_DBCONNECTIVITY fi AC_SUBST(DISABLE_DBCONNECTIVITY) @@ -2088,6 +2089,7 @@ if test $enable_scripting = yes;
[Libreoffice-commits] .: sd/source
sd/source/ui/view/MediaObjectBar.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 84665adcea8e80bedad15916a183574344a3d146
Author: Katarina Machalkova bu...@bubli.org
Date: Thu Mar 8 22:05:15 2012 +0100
fdo#32598: Changing media playback options sets modified flag
diff --git a/sd/source/ui/view/MediaObjectBar.cxx
b/sd/source/ui/view/MediaObjectBar.cxx
index 3530a37..4bf22c3 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -154,6 +154,10 @@ void MediaObjectBar::Execute( SfxRequest rReq )
{
static_cast sdr::contact::ViewContactOfSdrMediaObj (
pObj-GetViewContact() ).executeMediaItem(
static_cast const ::avmedia::MediaItem ( *pItem ) );
+
+//fdo #32598: after changing playback opts, set document's
modified flag
+SdDrawDocument rDoc = mpView-GetDoc();
+rDoc.SetChanged(sal_True);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - ios/qa
ios/qa/sc/Makefile |2 +- ios/qa/sc/filters-test.m |7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 1f36132b1995dc1e89d2b0b372f5805a9d3c5a95 Author: Tor Lillqvist t...@iki.fi Date: Thu Mar 8 23:30:03 2012 +0200 Set SRC_ROOT and OUTDIR_FOR_BUILD (!) to get it get a bit further along diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 88de28a..19be41e 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -27,6 +27,8 @@ * instead of those above. */ +#include stdlib.h + #import UIKit/UIKit.h #include cppunit/extensions/TestFactoryRegistry.h @@ -67,6 +69,11 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions self.window = uiw; [uiw release]; + // See unotest/source/cpp/bootstrapfixturebase.cxx + const char *app_root = [[[NSBundle mainBundle] bundlePath] UTF8String]; + setenv(SRC_ROOT, app_root, 1); + setenv(OUTDIR_FOR_BUILD, app_root, 1); + CppUnitTestPlugIn *iface = cppunitTestPlugIn(); iface-initialize(CppUnit::TestFactoryRegistry::getRegistry(), CppUnit::PlugInParameters()); commit 82a8c4cf35abdd7d8db323068bd0a840b4901ee3 Author: Tor Lillqvist t...@iki.fi Date: Wed Mar 7 17:15:08 2012 +0200 Add more libs diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile index 1300785..1cbbb01 100644 --- a/ios/qa/sc/Makefile +++ b/ios/qa/sc/Makefile @@ -30,7 +30,7 @@ SRCS = filters-test.m CFLAGS = $(SOLARINC) -LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcomphelpgcc3 -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc +LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a -Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucbhelper4gcc3 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc all: $(APPDIR)/$(APP) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/inc
sal/inc/osl/file.hxx | 58 +++
1 file changed, 58 insertions(+)
New commits:
commit af5cc38cac0defcfc36796915e13ddd5969a7108
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Thu Mar 8 14:29:23 2012 +1030
sal file.hxx documentation
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index eb25e63..0ad8922 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -739,6 +739,7 @@ public:
@see getFileType
@see isRegular
@see isLink
+@since 3.6
*/
inline sal_Bool isFile() const
{
@@ -752,6 +753,7 @@ public:
True if it's a directory, False otherwise.
@see getFileType
+@since 3.6
*/
inline sal_Bool isDirectory() const
{
@@ -766,6 +768,7 @@ public:
@see getFileType
@see isFile
@see isLink
+@since 3.6
*/
inline sal_Bool isRegular() const
{
@@ -778,6 +781,7 @@ public:
True if it's a link, False otherwise.
@see getFileType
+@since 3.6
*/
inline sal_Bool isLink() const
{
commit b64352905ff5fc64e3b2d800766dcfd19b28f533
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Thu Mar 8 09:07:16 2012 +1030
Added FileStatus methods isFile, isDirectory, isRegular, isLink
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 8c97750..eb25e63 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -730,6 +730,60 @@ public:
return (_aStatus.uValidFields osl_FileStatus_Mask_Type) ? (Type)
_aStatus.eType : Unknown;
}
+/** Is it a file?
+This method returns True for both regular files, and links.
+
+@return
+True if it's a file, False otherwise.
+
+@see getFileType
+@see isRegular
+@see isLink
+*/
+inline sal_Bool isFile() const
+{
+return ( getFileType() == Regular || getFileType() == Link );
+}
+
+/** Is it a directory?
+This method returns True for both directories, and volumes.
+
+@return
+True if it's a directory, False otherwise.
+
+@see getFileType
+*/
+inline sal_Bool isDirectory() const
+{
+return ( getFileType() == Directory || getFileType() == Volume );
+}
+
+/** Is it a regular file?
+
+@return
+True if it's a regular file, False otherwise.
+
+@see getFileType
+@see isFile
+@see isLink
+*/
+inline sal_Bool isRegular() const
+{
+return ( getFileType() == Regular );
+}
+
+/** Is it a link?
+
+@return
+True if it's a link, False otherwise.
+
+@see getFileType
+*/
+inline sal_Bool isLink() const
+{
+return ( getFileType() == Link );
+}
+
/** Get the file attributes.
@return
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/attrdlg/condfrmt.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit f361431f944abd9e12fad80f4880fa111214ff06 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Mar 9 01:17:13 2012 +0100 Set entries correctly visible, fdo#47102 diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 54d7a4b..ca41c8f 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -647,6 +647,8 @@ IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond11Hdl) aRbCond12.Hide(); aRbCond11.SetPosPixel( aRBtn1Pos2 ); aEdtCond11.SetPosSizePixel( aCond1Pos1, aCond1Size1 ); +aEdtCond11.Show(); +aRbCond11.Show(); } ChangeCond12Hdl( NULL ); @@ -742,6 +744,8 @@ IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond21Hdl) aRbCond22.Hide(); aRbCond21.SetPosPixel( aRBtn2Pos2 ); aEdtCond21.SetPosSizePixel( aCond2Pos1, aCond2Size1 ); +aEdtCond21.Show(); +aRbCond21.Show(); } ChangeCond22Hdl( NULL ); @@ -839,6 +843,8 @@ IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond31Hdl) aRbCond32.Hide(); aRbCond31.SetPosPixel( aRBtn3Pos2 ); aEdtCond31.SetPosSizePixel( aCond3Pos1, aCond3Size1 ); +aEdtCond31.Show(); +aRbCond31.Show(); } ChangeCond32Hdl( NULL ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/dbgui/filtdlg.cxx |2 --
sc/source/ui/dbgui/foptmgr.cxx | 30 ++
sc/source/ui/dbgui/sfiltdlg.cxx |2 --
sc/source/ui/inc/filtdlg.hxx|1 -
sc/source/ui/inc/foptmgr.hxx|2 --
5 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit ecdc626d91d723c9861345008d6563b118a92a7a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 9 01:51:54 2012 +0100
don't show the anonymous db string, it is for internal use only
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index eec3c88..61bd2ce 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -196,9 +196,17 @@ void ScFilterOptionsMgr::Init()
}
}
-theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM( ());
-theDbArea.append(theDbName).append(')');
-rFtDbArea.SetText( theDbArea.makeStringAndClear() );
+if (
!theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) )
+{
+theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM( ());
+theDbArea.append(theDbName).append(')');
+rFtDbArea.SetText( theDbArea.makeStringAndClear() );
+}
+else
+{
+rFtDbAreaLabel.SetText( rtl::OUString() );
+rFtDbArea.SetText( rtl::OUString() );
+}
//--
// Kopierposition:
commit 259839dcb9ee74c3a24bbec12de4ec92b56ad62e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 9 01:40:03 2012 +0100
use new anonymous db name in filter dlg, fdo#47105
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index d3dc905..94776ce 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -114,7 +114,6 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow*
pCW, Window* pParent,
aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
aFtDbArea ( this, ScResId( FT_DBAREA ) ),
aStrUndefined ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
-aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
aStrNone( ResId::toString(ScResId(SCSTR_NONE)) ),
aStrEmpty ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
aStrNotEmpty( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
@@ -289,7 +288,6 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )
aFtDbAreaLabel,
aFtDbArea,
aFlOptions,
-aStrNoName,
aStrUndefined );
// Read in field lists and select entries
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index a7b2a80..eec3c88 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -42,6 +42,7 @@
#include viewdata.hxx
#include document.hxx
#include queryparam.hxx
+#include globalnames.hxx
#define _FOPTMGR_CXX
#include foptmgr.hxx
@@ -66,7 +67,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
FixedText refFtDbAreaLabel,
FixedInfo refFtDbArea,
FixedLine refFlOptions,
-const String refStrNoName,
const String refStrUndefined )
: pDlg( ptrDlg ),
@@ -85,7 +85,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
rFtDbAreaLabel ( refFtDbAreaLabel ),
rFtDbArea ( refFtDbArea ),
rFlOptions ( refFlOptions ),
-rStrNoName ( refStrNoName ),
rStrUndefined ( refStrUndefined ),
rQueryData ( refQueryData )
{
@@ -136,7 +135,7 @@ void ScFilterOptionsMgr::Init()
if ( pViewData pDoc )
{
-String theAreaStr;
+rtl::OUString theAreaStr;
ScRange theCurArea ( ScAddress( rQueryData.nCol1,
rQueryData.nRow1,
pViewData-GetTabNo() ),
@@ -144,8 +143,8 @@ void ScFilterOptionsMgr::Init()
rQueryData.nRow2,
pViewData-GetTabNo() ) );
ScDBCollection* pDBColl = pDoc-GetDBCollection();
-String theDbArea;
-String theDbName = rStrNoName;
+rtl::OUStringBuffer theDbArea;
+rtl::OUString
theDbName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME));
const formula::FormulaGrammar::AddressConvention eConv =
pDoc-GetAddressConvention();
theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv );
@@ -190,17 +189,16 @@ void ScFilterOptionsMgr::Init()
rBtnHeader.Check( pDBData-HasHeader() );
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/globstr.hrc |2 --
sc/source/ui/dbgui/dbnamdlg.cxx |7 ---
sc/source/ui/src/globstr.src|4
3 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 59dcb5918dbcb93173afcd5bc4f3b01fa7bef1ee
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 9 02:16:06 2012 +0100
prevent creating new db ranges with the internal anonymous db name
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 0f32a4d..493b2db 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -469,7 +469,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
if ( aNewName.Len() 0 aNewArea.Len() 0 )
{
-if ( ScRangeData::IsNameValid( aNewName, pDoc ) )
+if ( ScRangeData::IsNameValid( aNewName, pDoc )
!aNewName.EqualsAscii(STR_DB_LOCAL_NONAME) )
{
// weil jetzt editiert werden kann, muss erst geparst werden
ScRange aTmpRange;
commit 66fbd3a48ac5608eeb45629b9d285790cfcefff6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 9 02:08:40 2012 +0100
remove one more reference to the anonymous db string
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 18850f8..0f32a4d 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -245,7 +245,6 @@ void ScDbNameDlg::Init()
pDBData = pDBColl-GetDBAtCursor( nStartCol, nStartRow, nStartTab,
sal_True );
if ( pDBData )
{
-::rtl::OUString theDbName;
ScAddress rStart = theCurArea.aStart;
ScAddress rEnd = theCurArea.aEnd;
SCCOL nCol1;
@@ -260,7 +259,9 @@ void ScDbNameDlg::Init()
(rStart.Col() == nCol1) (rStart.Row() == nRow1)
(rEnd.Col() == nCol2) (rEnd.Row() == nRow2 ) )
{
-aEdName.SetText(pDBData-GetName());
+rtl::OUString aDBName = pDBData-GetName();
+if
(!aDBName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+aEdName.SetText(aDBName);
aBtnHeader.Check( pDBData-HasHeader() );
aBtnDoSize.Check( pDBData-IsDoSize() );
commit 50ade1da6464c99bd9670dbaa2fc1a9dadf6b914
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 9 02:00:47 2012 +0100
remove old unnamed db string
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 48f4015..5157eb6 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -67,8 +67,6 @@
#define STR_UNDO_IMPORTDATA 37
#define STR_UNDO_REPEATDB 38
-#define STR_DB_NONAME 39
-
#define STR_MSSG_DOSUBTOTALS_0 40
#define STR_MSSG_DOSUBTOTALS_1 41
#define STR_MSSG_DOSUBTOTALS_2 42
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 2e852ec..164e12d 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -365,10 +365,6 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = ~Change Case;
};
-String STR_DB_NONAME
-{
-Text [ en-US ] = unnamed ;
-};
String STR_DBNAME_IMPORT
{
Text [ en-US ] = Import ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
