[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jurt/com
jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit d386b1dacf8802521eb5c385c63ee7666f112e1b
Author: Jürgen Schmidt j...@apache.org
Date: Wed Feb 26 07:32:47 2014 +
#124315# insert check for libs with jnilib extension on mac os
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index d896c09..9bec01a 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -48,8 +48,18 @@ public final class NativeLibraryLoader {
library name is system dependent
*/
public static void loadLibrary(ClassLoader loader, String libname) {
+String syslibname = System.mapLibraryName(libname);
+
File path = getResource(loader, System.mapLibraryName(libname));
if (path == null) {
+// check special jni lib extension on Mac
+if (syslibname.contains(dylib)) {
+syslibname = syslibname.replace(dylib, jnilib);
+}
+path = getResource(loader, syslibname);
+}
+
+if (path == null) {
// If the library cannot be found as a class loader resource, try
// the global System.loadLibrary as a last resort:
System.loadLibrary(libname);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d3/86b1dacf8802521eb5c385c63ee7666f112e1b
d3/86b1dacf8802521eb5c385c63ee7666f112e1b |1 + 1 file changed, 1 insertion(+) New commits: commit 6b9ec15e6b91f92302def29dad5a59348c13af0f Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 26 09:14:26 2014 +0100 Notes added by 'git notes add' diff --git a/d3/86b1dacf8802521eb5c385c63ee7666f112e1b b/d3/86b1dacf8802521eb5c385c63ee7666f112e1b new file mode 100644 index 000..02b27bd --- /dev/null +++ b/d3/86b1dacf8802521eb5c385c63ee7666f112e1b @@ -0,0 +1 @@ +prefer: 0d396800021684a8c0875e45ed1440011fd7f9b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC 2014: let's go!
Hello fellow LO hackers, As you may have seen, Google has selected LibreOffice among other organizations to participate to Summer of Code 2014. Here are the next steps: * All mentors should register on google melange [0] and connect to LibreOffice [1]. * Help us co-mentor the tasks where only one mentor is listed on the ideas page [2]. Students will start filing applications in Google Melange on March. 10th. [0]: http://www.google-melange.com/gsoc/homepage/google/gsoc2014 [1]: http://www.google-melange.com/gsoc/connection/pick/google/gsoc2014 [2]: https://wiki.documentfoundation.org/Development/Gsoc/Ideas Thanks for your help, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source toolkit/source uui/source vcl/source xmloff/source
sw/source/core/txtnode/thints.cxx |7 ---
sw/source/core/undo/rolbck.cxx |3 ++-
sw/source/core/unocore/unoparagraph.cxx |4 ++--
toolkit/source/controls/unocontrolmodel.cxx |4 ++--
uui/source/iahndl-errorhandler.cxx |7 +++
uui/source/iahndl-filter.cxx|5 +++--
vcl/source/edit/vclmedit.cxx|5 ++---
xmloff/source/draw/shapeexport.cxx |5 ++---
8 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit d5c59404bec65c8a9d9e05c1fcc24e068d170924
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Feb 26 17:20:31 2014 +0900
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I773524536c0ed7bc34eb08cd35cfc77e83f722ba
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index 6a8da0e..164daf8 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -70,6 +70,7 @@
#include svl/smplhint.hxx
#include algorithm
#include map
+#include boost/scoped_ptr.hpp
#ifdef DBG_UTIL
#define CHECK Check(true);
@@ -1004,7 +1005,7 @@ SwTxtAttr* MakeTxtAttr(
// If the attribute is an auto-style which refers to a pool that is
// different from rDoc's pool, we have to correct this:
const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_castconst
SwFmtAutoFmt(rAttr).GetStyleHandle();
-::std::auto_ptrconst SfxItemSet pNewSet(
+boost::scoped_ptrconst SfxItemSet pNewSet(
pAutoStyle-SfxItemSet::Clone( sal_True, rDoc.GetAttrPool()
));
SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd );
return pNew;
@@ -2138,7 +2139,7 @@ bool SwTxtNode::GetAttr( SfxItemSet rSet, sal_Int32
nStt, sal_Int32 nEnd,
else// es ist ein Bereich definiert
{
// #i75299#
-::std::auto_ptr std::vector SwPoolItemEndPair pAttrArr;
+boost::scoped_ptr std::vector SwPoolItemEndPair pAttrArr;
const sal_uInt16 coArrSz =
static_castsal_uInt16(RES_TXTATR_WITHEND_END) -
static_castsal_uInt16(RES_CHRATR_BEGIN);
@@ -2174,7 +2175,7 @@ bool SwTxtNode::GetAttr( SfxItemSet rSet, sal_Int32
nStt, sal_Int32 nEnd,
if( bChkInvalid )
{
// uneindeutig ?
-::std::auto_ptr SfxItemIter pItemIter;
+boost::scoped_ptr SfxItemIter pItemIter;
const SfxPoolItem* pItem = 0;
if ( RES_TXTATR_AUTOFMT == pHt-Which() )
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 0be55af..d53eec6 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -54,6 +54,7 @@
#include comcore.hrc
#include undo.hrc
#include bookmrk.hxx
+#include boost/scoped_ptr.hpp
OUString SwHistoryHint::GetDescription() const
{
@@ -599,7 +600,7 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
SwNodes rNds = pDoc-GetNodes();
IDocumentMarkAccess* pMarkAccess = pDoc-getIDocumentMarkAccess();
-::std::auto_ptrSwPaM pPam;
+boost::scoped_ptrSwPaM pPam;
::sw::mark::IMark* pMark = NULL;
if(m_bSavePos)
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index db571cb..212aef3 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -46,7 +46,7 @@
#include com/sun/star/text/WrapTextMode.hpp
#include com/sun/star/text/TextContentAnchorType.hpp
#include comphelper/servicehelper.hxx
-
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star;
@@ -1025,7 +1025,7 @@ throw (beans::UnknownPropertyException,
uno::RuntimeException)
// to paragraph boundaries
SwPosition aStart( *aCursor.Start() );
SwPosition aEnd ( *aCursor.End() );
-::std::auto_ptrSwUnoCrsr pTemp(
+boost::scoped_ptrSwUnoCrsr pTemp(
aCursor.GetDoc()-CreateUnoCrsr(aStart, false) );
if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
{
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index f1dfb72..3af23cb 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -49,8 +49,8 @@
#include vcl/svapp.hxx
#include uno/data.h
-#include memory
#include set
+#include boost/scoped_ptr.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1326,7 +1326,7 @@ void UnoControlModel::setPropertyValues( const
::com::sun::star::uno::Sequence
{
// if somebody sets properties which are single aspects of a font
descriptor,
// remove them, and build a font descriptor instead
-::std::auto_ptr awt::FontDescriptor pFD;
+
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/swhtml.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7feb9a9c711835d852f4551670793b24e2fa82b6
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 25 20:28:46 2014 +0100
Fix a crashtest + default value + fix a wrong copy paste
Change-Id: Ic7a4ff410b2e4450c5f5220c6201931ca3e15a02
Reviewed-on: https://gerrit.libreoffice.org/8307
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1bc33ef..b348b96 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2414,6 +2414,12 @@ void SwHTMLParser::AddParSpace()
}
else
{
+if (!pTxtNode-HasHints())
+{
+pTxtNode-SetAttr(
+SvxULSpaceItem( rULSpace.GetUpper(), HTML_PARSPACE,
RES_UL_SPACE ) );
+return;
+}
//What I do here, is that I examine the attributes, and if
//I find out, that it's CJK/CTL, then I set the paragraph space
//to the value set in HTML_CJK_PARSPACE/HTML_CTL_PARSPACE.
@@ -3629,7 +3635,7 @@ void SwHTMLParser::NewBasefontAttr()
SvxFontHeightItem aFontHeightCJK( aFontHeights[nSize-1], 100,
RES_CHRATR_CJK_FONTSIZE );
InsertAttr( aAttrTab.pFontHeightCJK, aFontHeightCJK, pCntxt );
SvxFontHeightItem aFontHeightCTL( aFontHeights[nSize-1], 100,
RES_CHRATR_CTL_FONTSIZE );
-InsertAttr( aAttrTab.pFontHeightCJK, aFontHeightCTL, pCntxt );
+InsertAttr( aAttrTab.pFontHeightCTL, aFontHeightCTL, pCntxt );
}
// den Kontext merken
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/Library_sc.mk
sc/Library_sc.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 16bf1d6da5955f28010bfd73afb64262c98f7e86 Author: Tor Lillqvist t...@collabora.com Date: Wed Feb 26 09:04:23 2014 +0200 Fix link error Need to exclude this file, too. Change-Id: Icc9d8b1d21b6da78275982a2a1a1e516d76f5b5f diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 2583937..b14708e 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -306,7 +306,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/Accessibility/AccessibleCellBase \ sc/source/ui/Accessibility/AccessibleContextBase \ sc/source/ui/Accessibility/AccessibleCsvControl \ - sc/source/ui/Accessibility/AccessibleDataPilotControl \ + $(if $(filter TRUE,$(MPL_SUBSET)),, \ + sc/source/ui/Accessibility/AccessibleDataPilotControl) \ sc/source/ui/Accessibility/AccessibleDocument \ sc/source/ui/Accessibility/AccessibleDocumentBase \ sc/source/ui/Accessibility/AccessibleDocumentPagePreview \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 12
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 4654e9b113a66c800161d0ee82d587055fff4f8b
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Jan 31 16:31:01 2014 +0530
fdo#74271: Added unit test code changes for footer contains hyperlink.
Problem description:
- If the document contains a hyperlink in footer
that starts with www (ex. www.google.com) then
the footer1.xml.rels of the roundtrip file contains
empty Target.
- Since the target is empty, the file get corrupted in MS Office 2007.
Implementation:
- If hyperlink starts with www then make bSmart as true.
Change-Id: Ifa2b587d3326152b2d9778bd818fbe68b1cf6410
Reviewed-on: https://gerrit.libreoffice.org/7766
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx
b/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx
new file mode 100644
index 000..27b00ed
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/footer-contain-hyperlink.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 324838e..194b7c6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3629,6 +3629,18 @@ DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_TextOutline,
TextEffects_TextOutlin
assertXPath(pXmlDoc,
/w:document/w:body/w:p[3]/w:r[1]/w:rPr/w14:textOutline/w14:bevel, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testFooterContainHyperlink,footer-contain-hyperlink.docx)
+{
+// Problem is that footer1.xml.rels contains the empty
+// Target due to which the file get corrupted
+// in MS Office 2007.
+// Check for footer1.xml.rels file.
+xmlDocPtr pXmlRels = parseExport(word/_rels/footer1.xml.rels);
+if (!pXmlRels)
+return;
+// Check the value of Target which is http://www.google.com/.
+
assertXPath(pXmlRels,/rels:Relationships/rels:Relationship,Target,http://www.google.com/;);
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 645b82f..29da65d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -810,7 +810,7 @@ bool AttributeOutputBase::AnalyzeURL( const OUString rUrl,
const OUString /*rT
}
else
{
-INetURLObject aURL( rUrl );
+INetURLObject aURL( rUrl, INET_PROT_NOT_VALID );
sURL = aURL.GetURLNoMark( INetURLObject::DECODE_UNAMBIGUOUS );
sMark = aURL.GetMark( INetURLObject::DECODE_UNAMBIGUOUS );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotest/source
unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f993a8930a660b23f099c91a6dc636fb4cbe6f87 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 22:44:55 2014 +0100 Remove visual noise from unotest Change-Id: I34d98f086d1a041516174a26cbf37fc3d75da155 Reviewed-on: https://gerrit.libreoffice.org/8333 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx index 12d4abf..553bcb9 100644 --- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx +++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx @@ -48,10 +48,10 @@ using namespace com::sun::star; //cppunit calls instantiates a new TextFixture for each test and calls setUp //and tearDown on that for every test in a fixture -// + //We basically need to call dispose on our root component context context to //shut down cleanly in the right order. -// + //But we can't setup and tear down the root component context for //every test because all the uno singletons will be invalid after //the first dispose. So lets setup the default context once before ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uui/source
uui/source/fltdlg.cxx| 12
uui/source/iahndl-authentication.cxx |6 ++--
uui/source/iahndl-errorhandler.cxx |6 ++--
uui/source/iahndl.cxx| 18 ++--
uui/source/iahndl.hxx|6 ++--
uui/source/logindlg.hxx | 14 -
uui/source/loginerr.hxx |2 -
uui/source/masterpasscrtdlg.hxx |2 -
uui/source/masterpassworddlg.hxx |2 -
uui/source/nameclashdlg.hrc |2 -
uui/source/nameclashdlg.hxx |2 -
uui/source/passwordcontainer.cxx | 50 +--
uui/source/passwordcontainer.hxx |8 ++---
uui/source/passworddlg.cxx |4 +-
uui/source/passworddlg.hxx |2 -
uui/source/services.cxx | 10 +++
uui/source/sslwarndlg.hxx|4 +-
uui/source/unknownauthdlg.hxx|4 +-
18 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit c4399bcd13cbe1cfa89c782e6667906c0b8bbb89
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 22:48:34 2014 +0100
Remove visual noise from uui
Change-Id: I64fa42929aad00fc63f2937527dd3539f9d6f7f3
Reviewed-on: https://gerrit.libreoffice.org/8337
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 137cd8a..ffc3973 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -35,7 +35,7 @@
namespace uui
{
-/*-//**
+/*-
@short initialize filter dialog with start values
@descr We set some necessary information on these instance for later
working and create internal structures.
After construction user should call SetFilters() and
SetURL() to fill listbox with selectable filter
@@ -64,7 +64,7 @@ FilterDialog::FilterDialog( Window* pParentWindow ,
FreeResource();
}
-/*-//**
+/*-
@short set file name on dialog control
@descr We convert given URL (it must be an URL!) into valid file name
and show it on our dialog.
@@ -82,7 +82,7 @@ void FilterDialog::SetURL( const OUString sURL )
m_ftURL.SetText( impl_buildUIFileName(sURL) );
}
-/*-//**
+/*-
@short change list of filter names
@descr We save given pointer internal and use it to fill our listbox
with given names.
Saved list pointer is used on method AskForFilter() too, to
find user selected item
@@ -116,7 +116,7 @@ void FilterDialog::ChangeFilters( const FilterNameList*
pFilterNames )
}
}
-/*-//**
+/*-
@short ask user for his decision
@descr We show the dialog and if user finish it with OK - we try to
find selected item in internal saved
name list (which you must set in ChangeFilters()!). If we
return sal_True as result, you can use out
@@ -159,7 +159,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr
pSelectedItem )
return bSelected;
}
-/*-//**
+/*-
@short helper class to calculate length of given string
@descr Instances of it can be used as callback for
INetURLObject::getAbbreviated() method to build
short URLs to show it on GUI. We use in ctor set OutputDevice
to call special VCL method ...
@@ -190,7 +190,7 @@ class StringCalculator : public ::cppu::WeakImplHelper1
::com::sun::star::util:
const OutputDevice* m_pDevice;
};
-/*-//**
+/*-
@short try to build short name of given URL to show it n GUI
@descr We detect type of given URL automaticly and build this short
name depend on this type ...
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source xmlhelp/source
sw/qa/extras/ooxmlexport/data/fdo74566.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 20
sw/source/filter/ww8/docxattributeoutput.cxx |5 +
sw/source/filter/ww8/wrtww8.hxx |2 +-
sw/source/filter/ww8/ww8atr.cxx | 17 +
xmlhelp/source/cxxhelp/provider/databases.cxx |8
6 files changed, 35 insertions(+), 17 deletions(-)
New commits:
commit 003342bfef0812454618f860a6e171c282d92d78
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 23:14:08 2014 +0100
Remove visual noise from xmlhelp
Change-Id: Idd4d9d556d6644350d1a14b9f81f5fd0df8ee2d1
Reviewed-on: https://gerrit.libreoffice.org/8344
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index df174a4..7b69b85 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -1509,7 +1509,7 @@ helpdatafileproxy::Hdf* DataBaseIterator::nextHdf(
OUString* o_pExtensionPath, O
// Later:
//case SHARED_MODULE
-//...
+
case USER_EXTENSIONS:
{
@@ -1624,7 +1624,7 @@ OUString KeyDataBaseFileIterator::nextDbFile( bool
o_rbExtension )
// Later:
//case SHARED_MODULE
-//...
+
case USER_EXTENSIONS:
{
@@ -1700,7 +1700,7 @@ Reference XHierarchicalNameAccess
JarFileIterator::nextJarFile
// Later:
//case SHARED_MODULE
-//...
+
case USER_EXTENSIONS:
{
@@ -1824,7 +1824,7 @@ OUString IndexFolderIterator::nextIndexFolder( bool
o_rbExtension, bool o_rbTe
// Later:
//case SHARED_MODULE
-//...
+
case USER_EXTENSIONS:
{
commit a31fbb53dba76736b37213b98b64937f05929a67
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Thu Feb 6 13:58:03 2014 +0530
fdo#74566:DOCX: Preservation w:br tag for Break to Next Page
Issue :
'Break to Next Page' gets converted to 'Page Break Before'
in RT.
XML diffrenece :
- LO exports w:br as w:pageBreakBefore / in document.xml
- The page break is written into wrong paragraph.
Implementation :
1] Removed implementation to export w:pageBreakBefore /.
2] Added a check to write w:br in correct paragraph.
3] Modified code to handle SectionBreak() even if Text node
has no string.
It is required when DOCX contains a PageBreak with footer.
4] Written Export Unit Test case.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7891
Change-Id: I237b9c5fdd3083b441f6e81cd8442f458eccf1a0
diff --git a/sw/qa/extras/ooxmlexport/data/fdo74566.docx
b/sw/qa/extras/ooxmlexport/data/fdo74566.docx
new file mode 100644
index 000..b197b94
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo74566.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 194b7c6..73d3393 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3641,6 +3641,26 @@
DECLARE_OOXMLEXPORT_TEST(testFooterContainHyperlink,footer-contain-hyperlink.do
// Check the value of Target which is http://www.google.com/.
assertXPath(pXmlRels,/rels:Relationships/rels:Relationship,Target,http://www.google.com/;);
}
+
+DECLARE_OOXMLEXPORT_TEST(testPageBreak,fdo74566.docx)
+{
+/* Break to next page was written into wrong paragraph as
w:pageBreakBefore /.
+ * LO was not preserving Page Break as w:br w:type=page /.
+ * Now after fix , LO writes Page Break as the new paragraph and also
+ * preserves the xml tag w:br.
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+uno::Referencetext::XTextRange xParagraph2 = getParagraph(2);
+uno::Referencetext::XTextRange xParagraph4 = getParagraph(4);
+
+getRun(xParagraph2, 1, First Page Second Line);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[3]/w:r[2]/w:br,type,page);
+getRun(xParagraph4, 1, Second Page First line after Page Break);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b27aadc..46258f9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -399,10 +399,7 @@ void DocxAttributeOutput::SectionBreaks(const SwTxtNode
rNode)
if ( aNextIndex.GetNode().IsTxtNode() )
{
const SwTxtNode* pTxtNode = static_cast
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww1/w1filter.cxx | 50 +++---
1 file changed, 25 insertions(+), 25 deletions(-)
New commits:
commit eb759974573220a38320ed6ec0d27089dafa1b42
Author: Stefan Ring stefan...@gmail.com
Date: Tue Feb 25 22:15:01 2014 +0100
Remove germanisms in variables: sw/source/filter/ww1
Change-Id: Ieb61128a6497fc8f980b315a949ce74b2dc4adce
Reviewed-on: https://gerrit.libreoffice.org/8324
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww1/w1filter.cxx
b/sw/source/filter/ww1/w1filter.cxx
index ac7b18d..b1df0d1 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -521,7 +521,7 @@ extern void sw3io_ConvertFromOldField( SwDoc rDoc,
sal_uInt16 rWhich,
void Ww1Fields::Out(Ww1Shell rOut, Ww1Manager rMan, sal_uInt16 nDepth)
{
OUString sType; // the type as string
-OUString sFormel;
+OUString sFormula;
OUString sFormat;
OUString sDTFormat; // date/time format
W1_FLD* pData = GetData(); // data bound to plc
@@ -547,7 +547,7 @@ void Ww1Fields::Out(Ww1Shell rOut, Ww1Manager rMan,
sal_uInt16 nDepth)
sType = aStr;
aStr = ;
}
-sFormel += aStr;
+sFormula += aStr;
sal_uInt8 rbType = pData-fltGet();
do {
// Read the formula part until the entire field ends or
@@ -560,27 +560,27 @@ void Ww1Fields::Out(Ww1Shell rOut, Ww1Manager rMan,
sal_uInt16 nDepth)
Out(rOut, rMan, nDepth+1);
rMan.Fill(c);
OSL_ENSURE(c==21, Ww1PlainText);
-sFormel += Ww + OUString::number(nPlcIndex);
+sFormula += Ww + OUString::number(nPlcIndex);
c = rMan.Fill(aStr, GetLength());
OSL_ENSURE(Ww1PlainText::IsChar(c), Ww1PlainText);
-sFormel += aStr;
+sFormula += aStr;
}
}
while (pData-chGet()==19);
// get format out of text
-pos = sFormel.indexOf(\\*);
+pos = sFormula.indexOf(\\*);
if (pos != -1)
{
-sFormat = sFormel.copy(pos);
-sFormel = sFormel.copy(0, pos);
+sFormat = sFormula.copy(pos);
+sFormula = sFormula.copy(0, pos);
}
-pos = sFormel.indexOf( \\@ );
+pos = sFormula.indexOf( \\@ );
if (pos != -1)
{
-sDTFormat = sFormel.copy(pos);
-sFormel = sFormel.copy(0, pos);
+sDTFormat = sFormula.copy(pos);
+sFormula = sFormula.copy(0, pos);
}
// The formula part is done, does a result part follow?
@@ -607,10 +607,10 @@ oncemore:
switch (rbType)
{
case 3: // bookmark reference
-sFormel = rOut.ConvertUStr(sFormel);
+sFormula = rOut.ConvertUStr(sFormula);
pField = new SwGetRefField( (SwGetRefFieldType*)
rOut.GetSysFldType( RES_GETREFFLD ),
-sFormel,
+sFormula,
REF_BOOKMARK,
0,
REF_CONTENT );
@@ -816,7 +816,7 @@ oncemore:
(SwGetExpFieldType*)rOut.GetSysFldType(RES_GETEXPFLD);
OSL_ENSURE(pFieldType!=0, Ww1Fields);
if (pFieldType != 0)
-pField = new SwGetExpField(pFieldType, sFormel,
+pField = new SwGetExpField(pFieldType, sFormula,
nsSwGetSetExpType::GSE_STRING, VVF_SYS);
}
else // recursion:
@@ -829,7 +829,7 @@ oncemore:
SwSetExpFieldType aS(rOut.GetDoc(), aName,
nsSwGetSetExpType::GSE_FORMULA);
pFT = rOut.GetDoc().InsertFldType(aS);
}
-SwSetExpField aFld((SwSetExpFieldType*)pFT, sFormel);
+SwSetExpField aFld((SwSetExpFieldType*)pFT, sFormula);
aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
rOut aFld;
}
@@ -869,7 +869,7 @@ oncemore:
case 37: // page ref
pField = new SwGetRefField(
(SwGetRefFieldType*)rOut.GetSysFldType(RES_GETREFFLD),
- sFormel, 0, 0, REF_PAGE);
+ sFormula, 0, 0, REF_PAGE);
break;
case 38: // ask command
{
@@ -898,7 +898,7 @@ oncemore:
case 39: // filling command
pField = new SwInputField(
static_castSwInputFieldType*(rOut.GetSysFldType(
RES_INPUTFLD )),
-OUString(), sFormel,
+OUString(), sFormula,
INP_TXT, 0, false );
break;
case 51: // macro button
@@ -926,24 +926,24 @@ oncemore:
break;
case 55: // read tiff / or better: import anything
{
-const sal_Unicode* pFormel = sFormel.getStr();
+const
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/formulacell.hxx | 12 -
sc/inc/listenercontext.hxx | 11 +
sc/inc/refupdatecontext.hxx | 18 ++
sc/source/core/data/column.cxx | 234 +++-
sc/source/core/data/formulacell.cxx | 17 +-
sc/source/core/data/listenercontext.cxx | 24 +++
sc/source/core/tool/token.cxx | 17 +-
sc/source/ui/inc/undoblk.hxx|5
sc/source/ui/undo/undoblk.cxx | 19 +-
9 files changed, 293 insertions(+), 64 deletions(-)
New commits:
commit df9206c4ad9227029f85caa84df358e66ecafe9d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Feb 25 12:53:33 2014 -0500
fdo#75386: Totally fix reference update during range move.
It was just not working at all due to multiple reasons. The
reference update needed to be reworked for formula groups such that
the token array is adjusted only for the top cell but all formula cells
still needed to be processed afterwards. The bound check also needed
to be done against the old range prior to the move, not the new range
after the move.
During undo, the paint had to be deferred until after the two calls to
DoUndo() else the formula cells would get re-calculated before the
values were placed back to their old positions, causing them to mis-
calculate wrong values.
Change-Id: Iba66f80a413e0539cac5ab619226cd6f7a04f317
(cherry picked from commit 79d03eb090a5f88863c1004ef8b7f483cbecb69d)
Reviewed-on: https://gerrit.libreoffice.org/8352
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e901c6e..7e40ddd 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -141,12 +141,6 @@ private:
const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
/**
- * Update reference in response to cell move.
- */
-bool UpdateReferenceOnMove(
-const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
-
-/**
* Update reference in response to cell copy-n-paste.
*/
bool UpdateReferenceOnCopy(
@@ -252,6 +246,12 @@ public:
bool UpdateReference(
const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc = NULL, const
ScAddress* pUndoCellPos = NULL );
+/**
+ * Update reference in response to cell move.
+ */
+bool UpdateReferenceOnMove(
+const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
+
voidTransposeReference();
voidUpdateTranspose( const ScRange rSource, const ScAddress
rDest,
ScDocument* pUndoDoc );
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 1e7d067..c0260ef 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -17,6 +17,7 @@
#include boost/scoped_ptr.hpp
class ScDocument;
+class ScTokenArray;
namespace sc {
@@ -39,9 +40,17 @@ class EndListeningContext : boost::noncopyable
ScDocument mrDoc;
ColumnSpanSet maSet;
boost::scoped_ptrColumnBlockPositionSet mpPosSet;
+ScTokenArray* mpOldCode;
+ScAddress maPosDelta; // Add this to get the old position prior to the
move.
+
public:
-EndListeningContext(ScDocument rDoc);
+EndListeningContext(ScDocument rDoc, ScTokenArray* pOldCode = NULL);
+
+void setPositionDelta( const ScAddress rDelta );
+
ScDocument getDoc();
+ScTokenArray* getOldCode();
+ScAddress getOldPosition( const ScAddress rPos ) const;
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index ba0beed..c8e52d8 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -55,7 +55,8 @@ struct RefUpdateContext
/**
* Range of cells that are about to be moved for insert/delete/move modes.
* For copy mode, it's the destination range of cells that are about to be
- * pasted.
+ * pasted. When moving a range of cells, it's the destination range, not
+ * the source range.
*/
ScRange maRange;
@@ -77,8 +78,23 @@ struct RefUpdateContext
struct RefUpdateResult
{
+/**
+ * When this flag is true, the result of the formula needs to be
+ * re-calculated either because it contains a reference that's been
+ * deleted, or the size of a range reference has changed.
+ */
bool mbValueChanged;
+
+/**
+ * This flag indicates whether any reference in the token array has been
+ * modified.
+ */
bool mbReferenceModified;
+
+/**
+ * When this flag is true, it indicates that the token array contains a
+ * range name that's been updated.
+ */
bool mbNameModified;
RefUpdateResult();
diff --git
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c380826561dfaf98a2cd64f436a69717a737bbd7
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Wed Feb 26 10:59:56 2014 +0100
update to 4.2.1 enabled
diff --git a/check.php b/check.php
index 5acae4d..48e58a3 100644
--- a/check.php
+++ b/check.php
@@ -264,7 +264,7 @@ $build_hash_to_version = array(
'c63c03decdf780d8fb80823950665b782ec9ecd' = '4.2.0.3',
'05dceb5d363845f2cf968344d7adab8dcfb2ba7' = '4.2.0.4', # unscheduled,
Final
# 4.2.1
-'d7dbbd7842e6a58b0f521599204e827654e1fb8' = '4.2.1.1',
+'d7dbbd7842e6a58b0f521599204e827654e1fb8' = '4.2.1.1', # rc1, was made
final
);
# Descriptions of the target versions
@@ -284,11 +284,11 @@ $update_map = array(
'update_src' =
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.1.5',
'substitute' = true ),
-'latest' = array('gitid' =
'1c1366bba2ba2b554cd2ca4d87c06da81c05d24',
- 'id' = 'LibreOffice 4.1.5',
- 'version' = '4.1.5',
+'latest' = array('gitid' =
'd7dbbd7842e6a58b0f521599204e827654e1fb8',
+ 'id' = 'LibreOffice 4.2.1',
+ 'version' = '4.2.1',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.1.5',
+ 'update_src' =
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.2.1',
'substitute' = true ),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dockwin.cxx | 116 --
1 file changed, 12 insertions(+), 104 deletions(-)
New commits:
commit 204642f30767ae0b206a74dce34e2755e810b4a5
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 08:24:18 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dockwin.cxx
(BTW: There seems to be some duplication between dockwin and dockmgr)
Conflicts:
vcl/source/window/dockwin.cxx
Change-Id: Icaf421620f87de7512a461b778958f6e141946db
Reviewed-on: https://gerrit.libreoffice.org/8171
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f733b53..8bf14c6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -34,15 +34,8 @@
#include salframe.hxx
-
-// ===
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
-// ===
-
-
-
class DockingWindow::ImplData
{
public:
@@ -63,8 +56,6 @@ DockingWindow::ImplData::~ImplData()
{
}
-
-
class ImplDockFloatWin : public FloatingWindow
{
private:
@@ -104,7 +95,7 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits
nWinBits,
mbInMove( false ),
mnLastUserEvent( 0 )
{
-// Daten vom DockingWindow uebernehmen
+// copy settings of DockingWindow
if ( pDockingWin )
{
SetSettings( pDockingWin-GetSettings() );
@@ -121,16 +112,12 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent,
WinBits nWinBits,
maDockTimer.SetTimeout( 50 );
}
-
-
ImplDockFloatWin::~ImplDockFloatWin()
{
if( mnLastUserEvent )
Application::RemoveUserEvent( mnLastUserEvent );
}
-
-
IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
{
DBG_ASSERT( mpDockWin-IsFloatingMode(), docktimer called but not
floating );
@@ -220,8 +207,6 @@ void ImplDockFloatWin::Move()
mnLastUserEvent = Application::PostUserEvent( LINK( this,
ImplDockFloatWin, DockingHdl ) );
}
-
-
void ImplDockFloatWin::Resize()
{
FloatingWindow::Resize();
@@ -229,54 +214,41 @@ void ImplDockFloatWin::Resize()
mpDockWin-ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(),
WINDOW_POSSIZE_POSSIZE );
}
-
-
void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton )
{
FloatingWindow::TitleButtonClick( nButton );
mpDockWin-TitleButtonClick( nButton );
}
-
-
void ImplDockFloatWin::Pin()
{
FloatingWindow::Pin();
mpDockWin-Pin();
}
-
-
void ImplDockFloatWin::Roll()
{
FloatingWindow::Roll();
mpDockWin-Roll();
}
-
-
void ImplDockFloatWin::PopupModeEnd()
{
FloatingWindow::PopupModeEnd();
mpDockWin-PopupModeEnd();
}
-
-
void ImplDockFloatWin::Resizing( Size rSize )
{
FloatingWindow::Resizing( rSize );
mpDockWin-Resizing( rSize );
}
-
-
bool ImplDockFloatWin::Close()
{
return mpDockWin-Close();
}
-// ===
bool DockingWindow::ImplStartDocking( const Point rPos )
{
@@ -289,7 +261,7 @@ bool DockingWindow::ImplStartDocking( const Point rPos )
mbLastFloatMode = IsFloatingMode();
mbStartFloat= mbLastFloatMode;
-// FloatingBorder berechnen
+// calculate FloatingBorder
FloatingWindow* pWin;
if ( mpFloatWin )
pWin = mpFloatWin;
@@ -331,7 +303,6 @@ bool DockingWindow::ImplStartDocking( const Point rPos )
return true;
}
-// ===
void DockingWindow::ImplInitDockingWindowData()
{
@@ -349,8 +320,6 @@ void DockingWindow::ImplInitDockingWindowData()
mbHideBtn = false;
}
-
-
void DockingWindow::ImplInit( Window* pParent, WinBits nStyle )
{
if ( !(nStyle WB_NODIALOGCONTROL) )
@@ -368,12 +337,10 @@ void DockingWindow::ImplInit( Window* pParent, WinBits
nStyle )
ImplInitSettings();
}
-
-
void DockingWindow::ImplInitSettings()
{
-// Hack, damit man auch DockingWindows ohne Hintergrund bauen kann
-// und noch nicht alles umgestellt ist
+// Hack: to be able to build DockingWindows w/o background before switching
+// TODO: Hack
if ( IsBackground() )
{
const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -389,8 +356,6 @@ void DockingWindow::ImplInitSettings()
}
}
-
-
void DockingWindow::ImplLoadRes( const ResId rResId )
{
Window::ImplLoadRes( rResId );
@@ -400,7 +365,7 @@ void DockingWindow::ImplLoadRes( const ResId rResId )
if ( (RSC_DOCKINGWINDOW_XYMAPMODE | RSC_DOCKINGWINDOW_X |
RSC_DOCKINGWINDOW_Y) nMask )
{
-// Groessenangabe aus der Resource verwenden
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #107 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=204642f30767ae0b206a74dce34e2755e810b4a5 fdo#39468 Translate German Comments - vcl/source/window/dockwin.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/floatwin.cxx | 80 -
1 file changed, 17 insertions(+), 63 deletions(-)
New commits:
commit 4e5fb3ae8aaa7a65b065f0415fe4df667dab3def
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 09:04:00 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/floatwin.cxx
Conflicts:
vcl/source/window/floatwin.cxx
Change-Id: I5cf91515e088f7f7bb766089c0812b023ecb3bdd
Reviewed-on: https://gerrit.libreoffice.org/8172
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 285b161..f006df8 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -34,8 +34,6 @@
#include tools/debug.hxx
-// ===
-
class FloatingWindow::ImplData
{
public:
@@ -60,7 +58,6 @@ Rectangle FloatingWindow::ImplGetItemEdgeClipRect()
return mpImplData-maItemEdgeClipRect;
}
-// ===
void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
{
@@ -138,8 +135,6 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits
nStyle )
ImplInitSettings();
}
-
-
void FloatingWindow::ImplInitSettings()
{
const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
@@ -154,7 +149,6 @@ void FloatingWindow::ImplInitSettings()
SetBackground( aColor );
}
-// ===
FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_FLOATINGWINDOW )
@@ -162,8 +156,6 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits
nStyle ) :
ImplInit( pParent, nStyle );
}
-
-
FloatingWindow::FloatingWindow( Window* pParent, const ResId rResId ) :
SystemWindow( WINDOW_FLOATINGWINDOW )
{
@@ -176,8 +168,6 @@ FloatingWindow::FloatingWindow( Window* pParent, const
ResId rResId ) :
Show();
}
-
-
void FloatingWindow::ImplLoadRes( const ResId rResId )
{
SystemWindow::ImplLoadRes( rResId );
@@ -187,7 +177,7 @@ void FloatingWindow::ImplLoadRes( const ResId rResId )
if ( (RSC_FLOATINGWINDOW_WHMAPMODE | RSC_FLOATINGWINDOW_WIDTH |
RSC_FLOATINGWINDOW_HEIGHT) nObjMask )
{
-// Groessenangabe aus der Resource verwenden
+// use Sizes from the Resource
SizeaSize;
MapUnit eSizeMap = MAP_PIXEL;
@@ -208,8 +198,6 @@ void FloatingWindow::ImplLoadRes( const ResId rResId )
}
}
-
-
FloatingWindow::~FloatingWindow()
{
if( mbPopupModeCanceled )
@@ -226,20 +214,16 @@ FloatingWindow::~FloatingWindow()
delete mpImplData;
}
-
-
Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle
rRect, sal_uLong nFlags, sal_uInt16 rArrangeIndex )
{
return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
}
-
-
Point FloatingWindow::ImplCalcPos( Window* pWindow,
const Rectangle rRect, sal_uLong nFlags,
sal_uInt16 rArrangeIndex )
{
-// Fenster-Position ermitteln
+// get window position
Point aPos;
SizeaSize = pWindow-GetSizePixel();
Rectangle aScreenRect =
pWindow-ImplGetFrameWindow()-GetDesktopRectPixel();
@@ -397,7 +381,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
break;
}
-// Evt. noch anpassen
+// adjust if necessary
if ( bBreak !(nFlags FLOATWIN_POPUPMODE_NOAUTOARRANGE) )
{
if ( (nArrangeAry[nArrangeIndex] == FLOATWIN_POPUPMODE_LEFT) ||
@@ -447,8 +431,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
return pW-OutputToScreenPixel( aPos );
}
-
-
FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const
Point rPos, sal_uInt16 rHitTest )
{
FloatingWindow* pWin = this;
@@ -505,8 +487,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window*
pReference, const Poin
return NULL;
}
-
-
FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
{
FloatingWindow* pWin = this;
@@ -524,8 +504,6 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
return pLastFoundWin;
}
-
-
bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
{
FloatingWindow* pWin = this;
@@ -542,8 +520,6 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const
Window* pWindow )
return false;
}
-
-
IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
{
mnPostId= 0;
@@ -553,11 +529,9 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
return 0;
}
-
-
bool FloatingWindow::Notify( NotifyEvent rNEvt )
{
-// Zuerst Basisklasse rufen wegen TabSteuerung
+// call Base Class first for tab control
[Libreoffice-commits] core.git: touch/idl
touch/idl/org/libreoffice/touch/Document.idl| 17 ++-- touch/idl/org/libreoffice/touch/XDocument.idl | 17 ++-- touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl | 17 ++-- 3 files changed, 27 insertions(+), 24 deletions(-) New commits: commit 99f92d7f3b73fbeee68dba1db02350df8a430223 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 22:34:20 2014 +0100 Use exact same license formatting in touch as elsewhere Change-Id: I7e1a41784fc12828a2f530a3e3019b95ade19cdf Reviewed-on: https://gerrit.libreoffice.org/8328 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/touch/idl/org/libreoffice/touch/Document.idl b/touch/idl/org/libreoffice/touch/Document.idl index b17fcbf..78582b5 100644 --- a/touch/idl/org/libreoffice/touch/Document.idl +++ b/touch/idl/org/libreoffice/touch/Document.idl @@ -1,10 +1,11 @@ -// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #ifndef org_libreoffice_touch_Document_idl #define org_libreoffice_touch_Document_idl @@ -22,4 +23,4 @@ service Document: #endif -// vim:set shiftwidth=4 softtabstop=4 expandtab: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/touch/idl/org/libreoffice/touch/XDocument.idl b/touch/idl/org/libreoffice/touch/XDocument.idl index 03f7800..3d61160 100644 --- a/touch/idl/org/libreoffice/touch/XDocument.idl +++ b/touch/idl/org/libreoffice/touch/XDocument.idl @@ -1,10 +1,11 @@ -// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #ifndef org_libreoffice_touch_XDocument_idl #define org_libreoffice_touch_XDocument_idl @@ -72,4 +73,4 @@ interface XDocument: com::sun::star::uno::XInterface #endif -// vim:set shiftwidth=4 softtabstop=4 expandtab: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl b/touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl index 9be51cf..3b3f0b0 100644 --- a/touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl +++ b/touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl @@ -1,10 +1,11 @@ -// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -// This file is part of the LibreOffice project. -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/. +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ #ifndef org_libreoffice_touch_XDocumentRenderCallback_idl #define org_libreoffice_touch_XDocumentRenderCallback_idl @@ -52,4 +53,4 @@ interface XDocumentRenderCallback: com::sun::star::uno::XInterface #endif -// vim:set shiftwidth=4 softtabstop=4 expandtab: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #108 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e5fb3ae8aaa7a65b065f0415fe4df667dab3def fdo#39468 Translate German Comments - vcl/source/window/floatwin.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox2.cxx | 277 ++---
1 file changed, 43 insertions(+), 234 deletions(-)
New commits:
commit 45261b88c4935c0a6dd57e8a47438b799d091957
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 11:41:20 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/toolbox2.cxx
Conflicts:
vcl/source/window/toolbox2.cxx
Change-Id: Ifcb3a31733d8122d228596e8ec1253990f979471
Reviewed-on: https://gerrit.libreoffice.org/8174
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ea5e3ef..aa27d30 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -56,12 +56,9 @@
using namespace vcl;
using namespace com::sun::star;
-// ===
#define TB_SEP_SIZE 8
-
-
ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
m_pLayoutData( NULL ),
mpImageListProvider( NULL ),
@@ -125,8 +122,6 @@ ImplToolItem::ImplToolItem()
init(0, 0, true);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage,
ToolBoxItemBits nItemBits ) :
maImage( rImage )
@@ -134,8 +129,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
Image rImage,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString rText,
ToolBoxItemBits nItemBits ) :
maText( rText )
@@ -143,8 +136,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
OUString rText,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image rImage,
const OUString rText, ToolBoxItemBits nItemBits )
:
maImage( rImage ),
@@ -153,8 +144,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
Image rImage,
init(nItemId, nItemBits, false);
}
-
-
ImplToolItem::ImplToolItem( const ImplToolItem rItem ) :
mpWindow( rItem.mpWindow ),
mpUserData ( rItem.mpUserData ),
@@ -188,14 +177,10 @@ ImplToolItem::ImplToolItem( const ImplToolItem rItem ) :
{
}
-
-
ImplToolItem::~ImplToolItem()
{
}
-
-
ImplToolItem ImplToolItem::operator=( const ImplToolItem rItem )
{
mpWindow= rItem.mpWindow;
@@ -230,8 +215,6 @@ ImplToolItem ImplToolItem::operator=( const ImplToolItem
rItem )
return *this;
}
-
-
Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth,
const Size rDefaultSize )
{
Size aSize( rDefaultSize ); // the size of 'standard' toolbox items
@@ -284,8 +267,6 @@ Size ImplToolItem::GetSize( bool bHorz, bool
bCheckMaxWidth, long maxWidth, cons
return aSize;
}
-
-
void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool
rbImage, bool rbText ) const
{
if ( meType != TOOLBOXITEM_BUTTON )
@@ -344,8 +325,6 @@ void ImplToolItem::DetermineButtonDrawStyle( ButtonType
eButtonType, bool rbIma
}
}
-
-
Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const
{
Rectangle aRect;
@@ -362,23 +341,16 @@ Rectangle ImplToolItem::GetDropDownRect( bool bHorz )
const
return aRect;
}
-
-
bool ImplToolItem::IsClipped() const
{
return ( meType == TOOLBOXITEM_BUTTON mbVisible maRect.IsEmpty() );
}
-
-
bool ImplToolItem::IsItemHidden() const
{
return ( meType == TOOLBOXITEM_BUTTON !mbVisible );
}
-
-
-
const OUString ToolBox::ImplConvertMenuString( const OUString rStr )
{
OUString aCvtStr( rStr );
@@ -388,8 +360,6 @@ const OUString ToolBox::ImplConvertMenuString( const
OUString rStr )
return aCvtStr;
}
-
-
void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint )
{
ImplUpdateInputEnable();
@@ -401,7 +371,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
{
mbFormat = true;
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
{
Invalidate( Rectangle( mnLeftBorder, mnTopBorder,
@@ -415,7 +385,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
{
mbFormat = true;
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
maTimer.Start();
}
@@ -425,11 +395,9 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool
bFullPaint )
ImplCallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED );
}
-
-
void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
{
-// Muss ueberhaupt eine neue Ausgabe erfolgen
+// do we need to redraw?
if ( IsReallyVisible() IsUpdateMode() )
{
if ( nIndex ==
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #109 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=45261b88c4935c0a6dd57e8a47438b799d091957 fdo#39468 Translate German Comments - vcl/source/window/toolbox2.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/alphabeticalIndex_MultipleColumns.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 22
+
sw/source/filter/ww8/docxattributeoutput.cxx |6 ++
sw/source/filter/ww8/docxattributeoutput.hxx |1
sw/source/filter/ww8/docxexport.hxx |2
sw/source/filter/ww8/rtfexport.hxx |3 +
sw/source/filter/ww8/wrtw8nds.cxx| 10
+---
sw/source/filter/ww8/wrtww8.hxx |5 ++
sw/source/filter/ww8/ww8atr.cxx | 24
++
writerfilter/source/dmapper/DomainMapper.cxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 14
+
11 files changed, 80 insertions(+), 9 deletions(-)
New commits:
commit 263938c4a8789d881f8e736d317b6bcc09c3bce5
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Thu Feb 13 20:02:53 2014 +0530
fdo#73596 [DOCX] Multiple Columns in Index
The number of columns in an Index is given by the \c switch.
During export, added section breaks before and after the Index;
this is to preserve the layout of the round tripped file in MS Office.
Modified MSWordExportBase::NoPageBreakSection so that
an incorrect nextPage section break is not exported.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8047
Change-Id: I364e19d6739c4c6a60e3c605044fc1fafd9147d3
diff --git
a/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_MultipleColumns.docx
b/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_MultipleColumns.docx
new file mode 100644
index 000..970166a
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_MultipleColumns.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 73d3393..6826a4d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3661,6 +3661,28 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreak,fdo74566.docx)
getRun(xParagraph4, 1, Second Page First line after Page Break);
}
+DECLARE_OOXMLEXPORT_TEST(testAlphabeticalIndex_MultipleColumns,alphabeticalIndex_MultipleColumns.docx)
+{
+// Bug :: fdo#73596
+/*
+ * Index with multiple columns was not imported correctly and
+ * hence not exported correctly...
+ * The column count is given by the \c switch.
+ * If the column count is explicitly specified,
+ * MS Office adds section breaks before and after the Index.
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[3]/w:r[2]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT( contents.match( INDEX \\c \4\\\e \) );
+// check for section breaks after and before the Index Section
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[2]/w:pPr/w:sectPr/w:type,val,continuous);
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[9]/w:pPr/w:sectPr/w:type,val,continuous);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 46258f9..77ee13e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -271,6 +271,7 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
m_pSectionInfo.reset();
m_bParagraphOpened = true;
+m_bIsFirstParagraph = false;
}
void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t
pTextNodeInfoInner )
@@ -3969,7 +3970,9 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC,
const WW8_SepInfo* pSectio
case msword::PageBreak:
if ( pSectionInfo )
{
-if ( !m_bParagraphOpened )
+// don't add section properties if this will be the first
+// paragraph in the document
+if ( !m_bParagraphOpened !m_bIsFirstParagraph)
{
// Create a dummy paragraph if needed
m_pSerializer-startElementNS( XML_w, XML_p, FSEND );
@@ -6624,6 +6627,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_nNextAnnotationMarkId( 0 ),
m_pTableWrt( NULL ),
m_bParagraphOpened( false ),
+ m_bIsFirstParagraph( true ),
m_nColBreakStatus( COLBRK_NONE ),
m_nTextFrameLevel( 0 ),
m_closeHyperlinkInThisRun( false ),
diff --git
[Libreoffice-commits] core.git: xmlscript/source
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a22ae26668b260edb7f724ffcff0abc935b6d64a Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 23:17:18 2014 +0100 Remove visual noise from xmlscript Change-Id: Id984fe846f28eba50f0fd480dca235482d150dd9 Reviewed-on: https://gerrit.libreoffice.org/8347 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 47ee825a..5691a50 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -105,7 +105,7 @@ void Frame::endElement() _events.clear(); } -//=== + Reference xml::input::XElement MultiPage::startChildElement( sal_Int32 nUid, OUString const rLocalName, Reference xml::input::XAttributes const xAttributes ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/inc xmloff/source
xmloff/inc/DomBuilderContext.hxx | 12
xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx |2
xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx |2
xmloff/inc/XMLRectangleMembersHandler.hxx|2
xmloff/source/chart/PropertyMaps.cxx |2
xmloff/source/core/DomBuilderContext.cxx |4
xmloff/source/core/facreg.cxx|2
xmloff/source/core/nmspmap.cxx |2
xmloff/source/core/xmlerror.cxx |4
xmloff/source/core/xmlexp.cxx|2
xmloff/source/core/xmlimp.cxx|4
xmloff/source/draw/numithdl.cxx |4
xmloff/source/draw/sdpropls.cxx |2
xmloff/source/draw/ximpnote.cxx |2
xmloff/source/draw/ximpstyl.cxx | 10
xmloff/source/draw/ximpstyl.hxx |2
xmloff/source/forms/layerexport.hxx |2
xmloff/source/style/AttributeContainerHandler.cxx|4
xmloff/source/style/EnumPropertyHdl.cxx |4
xmloff/source/style/MarkerStyle.cxx |2
xmloff/source/style/NamedBoolPropertyHdl.cxx |4
xmloff/source/style/WordWrapPropertyHdl.cxx |4
xmloff/source/style/XMLClipPropertyHandler.cxx |4
xmloff/source/style/adjushdl.cxx |8
xmloff/source/style/backhdl.cxx |4
xmloff/source/style/bordrhdl.cxx |8
xmloff/source/style/breakhdl.cxx |8
xmloff/source/style/chrhghdl.cxx | 12
xmloff/source/style/escphdl.cxx |8
xmloff/source/style/impastpl.cxx | 20 -
xmloff/source/style/kernihdl.cxx |4
xmloff/source/style/lspachdl.cxx | 12
xmloff/source/style/postuhdl.cxx |4
xmloff/source/style/shadwhdl.cxx |4
xmloff/source/style/shdwdhdl.cxx |4
xmloff/source/style/tabsthdl.cxx |4
xmloff/source/style/undlihdl.cxx | 12
xmloff/source/style/xmlnumfi.cxx | 36 +-
xmloff/source/style/xmlstyle.cxx |4
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx |8
xmloff/source/text/XMLIndexTemplateContext.cxx |4
xmloff/source/text/XMLPropertyBackpatcher.cxx|8
xmloff/source/text/XMLSectionExport.cxx |8
xmloff/source/text/txtexppr.cxx |4
xmloff/source/text/txtflde.cxx |6
xmloff/source/text/txtfldi.cxx | 148 +--
xmloff/source/text/txtimppr.cxx |2
xmloff/source/text/txtparae.cxx |6
xmloff/source/text/txtvfldi.cxx | 66 ++--
xmloff/source/xforms/SchemaContext.hxx |8
xmloff/source/xforms/SchemaRestrictionContext.hxx|8
xmloff/source/xforms/SchemaSimpleTypeContext.hxx |8
xmloff/source/xforms/TokenContext.hxx|8
xmloff/source/xforms/XFormsBindContext.hxx |8
xmloff/source/xforms/XFormsInstanceContext.hxx |8
xmloff/source/xforms/XFormsModelContext.hxx |8
xmloff/source/xforms/XFormsSubmissionContext.hxx |8
xmloff/source/xforms/xformsapi.hxx |4
xmloff/source/xforms/xformsexport.cxx| 28 +-
59 files changed, 295 insertions(+), 295 deletions(-)
New commits:
commit e23ea87cb395fe8dc3cdf5d6160962bc4b4dcd28
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 23:15:32 2014 +0100
Remove visual noise from xmloff
Change-Id: I205d4e555f5b88654a90007eb7ac05bc7b00a904
Reviewed-on: https://gerrit.libreoffice.org/8346
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 0de3c49..a263b9d 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -23,9 +23,9 @@
#include xmloff/xmlictxt.hxx
-//
+
// forward declarations
-//
+
namespace com { namespace sun { namespace star {
namespace xml { namespace dom {
@@ -62,17 +62,17
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww1/w1class.cxx |6 +++---
sw/source/filter/ww1/w1filter.cxx |4 ++--
sw/source/filter/ww1/w1par.cxx|2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a4f0d096058709f89860178d88e4bad97e458995
Author: Stefan Ring stefan...@gmail.com
Date: Wed Feb 26 11:25:33 2014 +0100
Translate german strings, potentially user-visible - sw/source/filter/ww1
These are mostly assertion-like messages.
Change-Id: Iabf8e2ea3411c51756765e160a9e654b06ca005d
Reviewed-on: https://gerrit.libreoffice.org/8356
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 799d50b..db40b6a 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -911,7 +911,7 @@ long Ww1Bookmarks::Len() const
{
if( nIsEnd )
{
-OSL_ENSURE( false, Falscher Aufruf (1) von Ww1Bookmarks::Len() );
+OSL_ENSURE( false, Invalid usage (1) of Ww1Bookmarks::Len() );
return 0;
}
sal_uInt16 nEndIdx = SVBT16ToShort(pPos[0]-GetData(nPlcIdx[0]));
@@ -1013,7 +1013,7 @@ Ww1Assoc::Ww1Assoc(Ww1Fib _rFib)
rFib.GetStream().Read(pBuffer, cb) == cb)
{
sal_uInt16 j;
-OSL_ENSURE( cb == SVBT16ToShort( *(SVBT16*)pBuffer ), size
missmatch);
+OSL_ENSURE( cb == SVBT16ToShort( *(SVBT16*)pBuffer ), size mismatch);
for (i=0,j=sizeof(SVBT16);jcb iCriteria1;i++)
{
pStrTbl[i] = pBuffer+j;
@@ -1102,7 +1102,7 @@ sal_Bool Ww1Pap::HasId0(sal_uInt16 nId)
UpdateIdx();
if( !pPap ){
-OSL_ENSURE( false, Ww1Pap::HasId():: kann kein pPap erzeugen );
+OSL_ENSURE( false, Ww1Pap::HasId():: cannot create a pPap );
return sal_False;
}
diff --git a/sw/source/filter/ww1/w1filter.cxx
b/sw/source/filter/ww1/w1filter.cxx
index b1df0d1..633b13d 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1219,7 +1219,7 @@ void Ww1Chp::Stop(Ww1Shell rOut, Ww1Manager rMan,
sal_Unicode)
if (aChpx.fsFtcGet())
rOut.EndItem(RES_CHRATR_FONT);
}else{
-OSL_ENSURE( !nPlcIndex, Chp-Attribut-Stop verloren );
+OSL_ENSURE( !nPlcIndex, Lost Chp-Attribut-Stop );
}
}
}
@@ -1391,7 +1391,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
}
else
{
-OSL_ENSURE(false, WW1Fonts::GetFont: Nicht existenter Font !);
+OSL_ENSURE(false, WW1Fonts::GetFont: Non-existent font !);
eFamily = FAMILY_SWISS;
aName = Helv;
ePitch = PITCH_VARIABLE;
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index f7861b5..48882eb 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -54,7 +54,7 @@ static sal_uLong WW1_Read_FieldIniFlags()
sal_uLong WW1Reader::Read(SwDoc rDoc, const OUString rBaseURL, SwPaM rPam,
const OUString /*cName*/)
{
sal_uLong nRet = ERR_SWG_READ_ERROR;
-OSL_ENSURE(pStrm!=NULL, W1-Read ohne Stream);
+OSL_ENSURE(pStrm!=NULL, W1-Read without Stream);
if (pStrm != NULL)
{
sal_Bool bNew = !bInsertMode; // New Doc ( no insert )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/testPageref.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 57 -
sw/source/filter/ww8/docxattributeoutput.hxx |3 -
4 files changed, 72 insertions(+), 3 deletions(-)
New commits:
commit 0fb3bdc5d3aa47a61affc67b20bdbb775808fb66
Author: Tushar Bende tushar.be...@synerzip.com
Date: Fri Feb 14 15:29:30 2014 +0530
fdo#72563 : PAGEREF field tag not preserved during Roundtrip
There was a problem that in case of TOC,PAGEREF field tag was not preserved
inside hyperlink during Roundtrip.
Reason found, there was no code support to handle PAGEREF in export.
- Added code support in export code to handle PAGEREF.
- Also added w:webHidden / tag for PAGEREF
- Earlier pushed code changes was corrupting some documents.
- Verified this patch on large set of Docx containing different combination
of hyperlinks.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8048
Change-Id: I2331a33100ed77e15a39ecc6db01b0e696ea62de
diff --git a/sw/qa/extras/ooxmlexport/data/testPageref.docx
b/sw/qa/extras/ooxmlexport/data/testPageref.docx
new file mode 100644
index 000..65ca38a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testPageref.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6826a4d..db7811c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2413,7 +2413,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, fdo69649.docx)
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
if (!pXmlDoc)
return;
-xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[21]/w:hyperlink/w:r[2]/w:t);
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[21]/w:hyperlink/w:r[5]/w:t);
xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
CPPUNIT_ASSERT(contents.match(15));
@@ -3683,6 +3683,19 @@
DECLARE_OOXMLEXPORT_TEST(testAlphabeticalIndex_MultipleColumns,alphabeticalInde
assertXPath(pXmlDoc,
/w:document/w:body/w:p[9]/w:pPr/w:sectPr/w:type,val,continuous);
}
+DECLARE_OOXMLEXPORT_TEST(testPageref, testPageref.docx)
+{
+// fdo#72563 : There was a problem that in case of TOC,PAGEREF field tag
was not preserved during Roundtrip
+// This test case is to verify that PAGEREF tag is coming with proper
values inside hyperlink tag.
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[2]/w:hyperlink/w:r[3]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT(contents.match(PAGEREF _Toc355095261 \\h));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 77ee13e..44372b6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -682,6 +682,39 @@ void DocxAttributeOutput::EndRun()
DoWriteBookmarks( );
DoWriteAnnotationMarks( );
+if( m_closeHyperlinkInThisRun m_startedHyperlink m_hyperLinkAnchor
!= m_hyperLinkAnchor.startsWith(_Toc))
+{
+OUString sToken;
+m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_webHidden, FSEND );
+m_pSerializer-endElementNS( XML_w, XML_rPr );
+m_pSerializer-startElementNS( XML_w, XML_fldChar,
+FSNS( XML_w, XML_fldCharType ), begin,
+FSEND );
+m_pSerializer-endElementNS( XML_w, XML_fldChar );
+m_pSerializer-endElementNS( XML_w, XML_r );
+
+
+m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_webHidden, FSEND );
+m_pSerializer-endElementNS( XML_w, XML_rPr );
+sToken = PAGEREF + m_hyperLinkAnchor + \\h; // '\h' Creates
a hyperlink to the bookmarked paragraph.
+DoWriteCmd( sToken );
+m_pSerializer-endElementNS( XML_w, XML_r );
+
+// Write the Field separator
+m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
+m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
+m_pSerializer-singleElementNS( XML_w, XML_webHidden, FSEND );
+m_pSerializer-endElementNS( XML_w, XML_rPr );
+
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 16 ++--
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 09a1c9d31fb8756d6c7157ea1056acfbfea64784
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Feb 21 21:55:59 2014 +0100
cppcheck: duplicateIf
- replace duplicate TIB_DROPDOWN test with TIB_DROPDOWN + TIB_DROPDOWNONLY
- consider also TIB_RADIOCHECK as AccessibleRole::TOGGLE_BUTTON
Change-Id: Id159349ae1515681f47c373ba3d839ed406284ab
Reviewed-on: https://gerrit.libreoffice.org/8164
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 6ff821c..7329e0a 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -83,15 +83,17 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
case TOOLBOXITEM_BUTTON :
{
ToolBoxItemBits nBits = m_pToolBox-GetItemBits( m_nItemId );
-if (( nBits TIB_DROPDOWN ) == TIB_DROPDOWN)
+if (
+ (( nBits TIB_DROPDOWN ) == TIB_DROPDOWN) ||
+ (( nBits TIB_DROPDOWNONLY ) == TIB_DROPDOWNONLY)
+ )
m_nRole = AccessibleRole::BUTTON_DROPDOWN;
-else if (( ( nBits TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
-( ( nBits TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
+else if (
+( ( nBits TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
+( ( nBits TIB_RADIOCHECK ) == TIB_RADIOCHECK ) ||
+( ( nBits TIB_AUTOCHECK ) == TIB_AUTOCHECK )
+ )
m_nRole = AccessibleRole::TOGGLE_BUTTON;
-else if ( (nBits TIB_DROPDOWN) == TIB_DROPDOWN )
-{
-m_nRole = AccessibleRole::BUTTON_DROPDOWN;
-}
else if ( m_pToolBox-GetItemWindow( m_nItemId ) )
m_nRole = AccessibleRole::PANEL;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg |binary 1 file changed New commits: commit 9a8200e229cf18c7b773bbc7bfb454548240bbcd Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 11:13:56 2014 + Restore jpg This reverts the jpg part of d9f0af83b7f0abe7119eefca62cbbca7eff818ef. Change-Id: Idcba2e16cc3f2fce9c04a225a5754841b4f39380 Reviewed-on: https://gerrit.libreoffice.org/8358 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg index 104f201..33bbe9b 100644 Binary files a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/alphabeticalIndex_AutoColumn.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 19 +
sw/source/filter/ww8/ww8atr.cxx | 37
++
3 files changed, 42 insertions(+), 14 deletions(-)
New commits:
commit a45bdb8aa8f3a183842c715106e4f6e59f2f94c7
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Fri Feb 14 19:13:03 2014 +0530
fdo#73596 [DOCX] Auto Columns in Index
When number of columns in the Index is not specified
by the \c switch, then avoid adding the section breaks
explicitly before and after the Index Section and \c '0'
in the field identifier string.
Also added UT for the same.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8104
Change-Id: I56826f72beea580d0ac5aef44d4a71fd29b77316
diff --git a/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_AutoColumn.docx
b/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_AutoColumn.docx
new file mode 100644
index 000..e08e943
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/alphabeticalIndex_AutoColumn.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index db7811c..337a69b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3696,6 +3696,25 @@ DECLARE_OOXMLEXPORT_TEST(testPageref, testPageref.docx)
CPPUNIT_ASSERT(contents.match(PAGEREF _Toc355095261 \\h));
}
+DECLARE_OOXMLEXPORT_TEST(testAlphabeticalIndex_AutoColumn,alphabeticalIndex_AutoColumn.docx)
+{
+// Bug :: fdo#73596
+/*
+ * When the columns in Index are 0; i.e not specified by the
+ * \c switch, don't write back '\c 0' or the section breaks
+ * before and after the Index Context
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[2]/w:r[2]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT( contents.match( INDEX \\e \) );
+// check for section break doestn't appear for any paragraph
+assertXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:sectPr, 0);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index db3270c..7086f7e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2058,15 +2058,6 @@ void AttributeOutputBase::StartTOX( const SwSection
rSect )
switch (pTOX-GetType())
{
case TOX_INDEX:
-
-// Add a continuous section break
-if( GetExport().AddSectionBreaksForTOX() )
-{
-sal_uLong nRstLnNum = 0;
-WW8_SepInfo rInfo( GetExport( ).pDoc-GetPageDesc( 0 ),
rSect.GetParent()-GetFmt() , nRstLnNum );
-GetExport( ).AttrOutput().SectionBreak( msword::PageBreak,
rInfo );
-}
-
eCode = ww::eINDEX;
sStr = FieldString(eCode);
@@ -2074,9 +2065,20 @@ void AttributeOutputBase::StartTOX( const SwSection
rSect )
const SwFmtCol rCol = (const SwFmtCol)(
rSect.GetFmt()-GetFmtAttr( RES_COL ) );
const SwColumns rColumns = rCol.GetColumns();
sal_Int32 nCol = rColumns.size();
-sStr += \\c \ + OUString::number( nCol ) + \;
-}
+if ( 0 nCol )
+{
+// Add a continuous section break
+if( GetExport().AddSectionBreaksForTOX() )
+{
+sal_uLong nRstLnNum = 0;
+WW8_SepInfo rInfo( GetExport(
).pDoc-GetPageDesc( 0 ), rSect.GetParent()-GetFmt() , nRstLnNum );
+GetExport( ).AttrOutput().SectionBreak(
msword::PageBreak, rInfo );
+}
+
+sStr += \\c \ + OUString::number( nCol ) + \;
+}
+}
if (pTOX-GetTOXForm().IsCommaSeparated())
sStr += \\r ;
@@ -2371,9 +2373,16 @@ void AttributeOutputBase::EndTOX( const SwSection
rSect,bool bCareEnd )
if ( pTOX-GetType() == TOX_INDEX
GetExport().AddSectionBreaksForTOX() )
{
-sal_uLong nRstLnNum = 0;
-WW8_SepInfo rInfo( GetExport( ).pDoc-GetPageDesc( 0 ),
rSect.GetFmt() , nRstLnNum );
-GetExport( ).AttrOutput().SectionBreak( msword::PageBreak, rInfo
);
+const SwFmtCol rCol = (const SwFmtCol)(
rSect.GetFmt()-GetFmtAttr( RES_COL ) );
+const SwColumns rColumns =
[Libreoffice-commits] core.git: 2 commits - vcl/quartz
vcl/quartz/ctlayout.cxx | 42 --
1 file changed, 24 insertions(+), 18 deletions(-)
New commits:
commit 3edcdd43f94e605c08314ab61f64c418b01f8dde
Author: Herbert Dürr h...@apache.org
Date: Thu Feb 20 13:52:52 2014 +
fdo#64957: #i124233# prevent the accumulation of rounding errors
in CTLayout::FillDXArry()
Change-Id: I8ee83068d71275874e4af364df253251dfb41c8c
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 152c1b2..1cb8c48 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -368,9 +368,8 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
long nPixWidth = GetTextWidth();
if( pDXArray ) {
-// initialize the result array
-for( int i = 0; i mnCharCount; ++i)
-pDXArray[i] = 0;
+// prepare the sub-pixel accurate logical-width array
+::std::vectorfloat aWidthVector( mnCharCount );
// handle each glyph run
CFArrayRef aGlyphRuns = CTLineGetGlyphRuns( mpCTLine );
const int nRunCount = CFArrayGetCount( aGlyphRuns );
@@ -388,9 +387,18 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
CTRunGetStringIndices( pGlyphRun, aFullRange, aIndexVec[0] );
for( int i = 0; i != nGlyphCount; ++i ) {
const int nRelIdx = aIndexVec[i];
-pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width);
+aWidthVector[nRelIdx] += aSizeVec[i].width;
}
}
+
+// convert the sub-pixel accurate array into classic pDXArray integers
+float fWidthSum = 0.0;
+sal_Int32 nOldDX = 0;
+for( int i = 0; i mnCharCount; ++i) {
+const sal_Int32 nNewDX = rint( fWidthSum += aWidthVector[i]);
+pDXArray[i] = nNewDX - nOldDX;
+nOldDX = nNewDX;
+}
}
return nPixWidth;
commit fe93c38a38a54a479170c1012862518687552c1a
Author: Tor Lillqvist t...@collabora.com
Date: Wed Feb 26 12:22:56 2014 +0200
Use SAL_OVERRIDE consistently in CTLayout
When adding SAL_OVERRIDE to the member functions marked virtual, I
found one that was not an override of anything, and actually not used
at all: GetGlyphOutlines().
Change-Id: I3e56caa6262b2f21f7f47e3851ab0e07bbc4b642
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 9dfa7f6..152c1b2 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -28,25 +28,24 @@ public:
explicitCTLayout( const CoreTextStyle* );
virtual ~CTLayout( void );
-virtual boolLayoutText( ImplLayoutArgs );
-virtual voidAdjustLayout( ImplLayoutArgs );
-virtual voidDrawText( SalGraphics ) const;
+virtual boolLayoutText( ImplLayoutArgs ) SAL_OVERRIDE;
+virtual voidAdjustLayout( ImplLayoutArgs ) SAL_OVERRIDE;
+virtual voidDrawText( SalGraphics ) const SAL_OVERRIDE;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point
rPos, int,
sal_Int32* pGlyphAdvances, int* pCharIndexes,
-const PhysicalFontFace** pFallbackFonts ) const;
+const PhysicalFontFace** pFallbackFonts ) const
SAL_OVERRIDE;
-virtual longGetTextWidth() const;
-virtual longFillDXArray( sal_Int32* pDXArray ) const;
+virtual longGetTextWidth() const SAL_OVERRIDE;
+virtual longFillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE;
virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const SAL_OVERRIDE;
-virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
-virtual boolGetGlyphOutlines( SalGraphics, PolyPolyVector ) const;
-virtual boolGetBoundRect( SalGraphics, Rectangle ) const;
+virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const SAL_OVERRIDE;
+virtual boolGetBoundRect( SalGraphics, Rectangle ) const
SAL_OVERRIDE;
-virtual voidInitFont( void) const;
-virtual voidMoveGlyph( int nStart, long nNewXPos );
-virtual voidDropGlyph( int nStart );
-virtual voidSimplify( bool bIsBase );
+virtual voidInitFont( void) const SAL_OVERRIDE;
+virtual voidMoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
+virtual voidDropGlyph( int nStart ) SAL_OVERRIDE;
+virtual voidSimplify( bool bIsBase ) SAL_OVERRIDE;
private:
CGPoint GetTextDrawPosition(void) const;
@@ -487,7 +486,6 @@ bool CTLayout::GetBoundRect( SalGraphics rGraphics,
Rectangle rVCLRect ) const
// glyph fallback is supported directly by Aqua
// so methods used only by MultiSalLayout can be dummy implementated
-bool CTLayout::GetGlyphOutlines( SalGraphics, PolyPolyVector ) const {
return false; }
void CTLayout::InitFont() const {}
void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void
[Libreoffice-commits] core.git: tools/source
tools/source/fsys/urlobj.cxx | 12 ++--
tools/source/generic/poly.cxx | 12 ++--
tools/source/inet/inetmime.cxx |6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 2cf9fe702310a2f3d69a543541582ea5fa191d58
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 22:31:37 2014 +0100
Remove visual noise from tools
Change-Id: I779bb5cf991e1fee1e2a2c0a4cd45af3c5f502bd
Reviewed-on: https://gerrit.libreoffice.org/8327
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 50feca8..539270e 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -694,7 +694,7 @@ bool INetURLObject::setAbsURIRef(OUString const
rTheAbsURIRef,
// productions that matches the input string (and for which the
// appropriate style bit is set in eStyle, if applicable)
// determines the scheme. The productions use the auxiliary rules
-//
+
//domain = label *(. label)
//label = alphanum [*(alphanum / -) alphanum]
//alphanum = ALPHA / DIGIT
@@ -705,7 +705,7 @@ bool INetURLObject::setAbsURIRef(OUString const
rTheAbsURIRef,
//hexseq = hex4 *(: hex4)
//hex4 = 1*4HEXDIG
//UCS4 = any UCS4 character
-//
+
// 1st Production (known scheme):
//one of the known schemes, ignoring case : *UCS4
// 2nd Production (mailto):
@@ -724,7 +724,7 @@ bool INetURLObject::setAbsURIRef(OUString const
rTheAbsURIRef,
//ALPHA : [/ *UCS4]
// 9th Production (DOS file; FSYS_DOS only):
//ALPHA : [\ *UCS4]
-//
+
// For the 'non URL' file productions 6--9, the interpretation of
// the input as a (degenerate) URI is turned off, i.e., escape
// sequences and fragments are never detected as such, but are
@@ -987,7 +987,7 @@ bool INetURLObject::setAbsURIRef(OUString const
rTheAbsURIRef,
// appropriate style bit is set in eStyle, if applicable)
// determines the used notation. The productions use the
// auxiliary rules
-//
+
//domain = label *(. label)
//label = alphanum [*(alphanum / -) alphanum]
//alphanum = ALPHA / DIGIT
@@ -1505,12 +1505,12 @@ bool INetURLObject::convertRelToAbs(OUString const
rTheRelURIRef,
// in INetURLObject::setAbsURIRef(), because most of those productions
// interfere with the syntax of relative URI references.) The
// productions use the auxiliary rules
-//
+
//domain = label *(. label)
//label = alphanum [*(alphanum / -) alphanum]
//alphanum = ALPHA / DIGIT
//UCS4 = any UCS4 character
-//
+
// 1st Production (UNC file; FSYS_DOS only):
//\\ domain [\ *UCS4]
// 2nd Production (Unix-like DOS file; FSYS_DOS only):
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 3a25b9b..7495194 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -794,10 +794,10 @@ static void ImplAdaptiveSubdivide(
::std::back_insert_iterator ::std::vector P
// Perform bezier flatness test (lecture notes from R. Schaback,
// Mathematics of Computer-Aided Design, Uni Goettingen, 2000)
-//
+
// ||P(t) - L(t)|| = max ||b_j - b_0 - j/n(b_n - b_0)||
//0=j=n
-//
+
// What is calculated here is an upper bound to the distance from
// a line through b_0 and b_3 (P1 and P4 in our notation) and the
// curve. We can drop 0 and n from the running indices, since the
@@ -1298,7 +1298,7 @@ Rectangle Polygon::GetBoundRect() const
// BoundRect of the Polygon (to get that, use basegfx::B2DPolygon classes),
// but will always create a valid BoundRect, at least as long as this
method
// 'blindly' travels over all points, including control points.
-//
+
// DBG_ASSERT( !mpImplPolygon-mpFlagAry, GetBoundRect could fail with
beziers! );
sal_uInt16 nCount = mpImplPolygon-mnPoints;
@@ -1635,7 +1635,7 @@ void impCorrectContinuity(basegfx::B2DPolygon roPolygon,
sal_uInt32 nIndex, sal
if(roPolygon.isPrevControlPointUsed(nIndex)
roPolygon.isNextControlPointUsed(nIndex))
{
// #i115917# Patch from osnola (modified, thanks for showing the
porblem)
-//
+
// The correction is needed because an integer polygon with
control points
// is converted to double precision. When C1 or C2 is used the
involved vectors
// may not have the same
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source writerfilter/source
sw/inc/toxe.hxx |3 -
sw/qa/extras/ooxmlexport/data/FDO75133.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +
sw/source/core/doc/doctxm.cxx |6 ++
sw/source/core/inc/doctxm.hxx |5 +-
sw/source/core/tox/tox.cxx|1
sw/source/filter/ww8/fields.cxx |3 -
sw/source/filter/ww8/fields.hxx |3 -
sw/source/filter/ww8/ww8atr.cxx |5 +-
sw/source/ui/inc/cnttab.hxx |1
sw/source/ui/index/cnttab.cxx |3 +
sw/source/ui/index/toxmgr.cxx | 25 +++
writerfilter/source/dmapper/DomainMapper.cxx |4 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 48 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |8 +++
writerfilter/source/dmapper/FieldTypes.hxx|5 +-
16 files changed, 114 insertions(+), 17 deletions(-)
New commits:
commit 598d02d71f40901eab9275704c8bc0e1641b56e3
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Tue Feb 18 12:23:14 2014 +0530
fdo#75133: Preseved bibliography after round trip.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Reviewed on:
https://gerrit.libreoffice.org/8124
Change-Id: Ieaea19600fbda3b536549a1a100f847f9ae3654b
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index 7de90e2..943a8e6 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.hxx
@@ -41,7 +41,8 @@ enum TOXTypes
TOX_ILLUSTRATIONS,
TOX_OBJECTS,
TOX_TABLES,
-TOX_AUTHORITIES
+TOX_AUTHORITIES,
+TOX_BIBLIOGRAPHY
};
// this enum contains all types of sources
enum ToxAuthorityType
diff --git a/sw/qa/extras/ooxmlexport/data/FDO75133.docx
b/sw/qa/extras/ooxmlexport/data/FDO75133.docx
new file mode 100644
index 000..93170dd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO75133.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 337a69b..4d6e3b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3715,6 +3715,17 @@
DECLARE_OOXMLEXPORT_TEST(testAlphabeticalIndex_AutoColumn,alphabeticalIndex_Aut
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:sectPr, 0);
}
+DECLARE_OOXMLEXPORT_TEST(testBibliography,FDO75133.docx)
+{
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+xmlNodeSetPtr pXmlNodes =
getXPathNode(pXmlDoc,/w:document/w:body/w:p[3]/w:r[2]/w:instrText);
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OUString contents = OUString::createFromAscii((const
char*)((pXmlNode-children[0]).content));
+CPPUNIT_ASSERT(contents.match( BIBLIOGRAPHY ));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index ad894df..6ff26a53 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -463,6 +463,7 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp,
bool bCreate )
case TOX_OBJECTS: prBase = mpDefTOXBases-pObjBase; break;
case TOX_ILLUSTRATIONS:prBase = mpDefTOXBases-pIllBase; break;
case TOX_AUTHORITIES: prBase = mpDefTOXBases-pAuthBase; break;
+case TOX_BIBLIOGRAPHY: prBase = mpDefTOXBases-pBiblioBase; break;
}
if(!(*prBase) bCreate)
{
@@ -485,6 +486,7 @@ voidSwDoc::SetDefaultTOXBase(const SwTOXBase rBase)
case TOX_OBJECTS: prBase = mpDefTOXBases-pObjBase; break;
case TOX_ILLUSTRATIONS:prBase = mpDefTOXBases-pIllBase; break;
case TOX_AUTHORITIES: prBase = mpDefTOXBases-pAuthBase; break;
+case TOX_BIBLIOGRAPHY: prBase = mpDefTOXBases-pBiblioBase; break;
}
if(*prBase)
delete (*prBase);
@@ -1087,7 +1089,9 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( sal_uInt16
nLevel )
case TOX_ILLUSTRATIONS: nPoolFmt = RES_POOLCOLL_TOX_ILLUSH; break;
case TOX_OBJECTS: nPoolFmt = RES_POOLCOLL_TOX_OBJECTH;break;
case TOX_TABLES:nPoolFmt = RES_POOLCOLL_TOX_TABLESH;break;
-case TOX_AUTHORITIES: nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH;
break;
+case TOX_AUTHORITIES:
+case TOX_BIBLIOGRAPHY:
+nPoolFmt = RES_POOLCOLL_TOX_AUTHORITIESH; break;
case TOX_CONTENT:
// There's a jump in the ContentArea!
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index d2e30a9..65cea1f 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -100,6 +100,7 @@ struct SwDefTOXBase_Impl
SwTOXBase* pObjBase;
SwTOXBase* pIllBase;
SwTOXBase* pAuthBase;
+SwTOXBase* pBiblioBase;
SwDefTOXBase_Impl() :
[Libreoffice-commits] core.git: 3 commits - basegfx/Library_basegfx.mk basegfx/source include/basegfx sc/source svx/source unusedcode.easy
basegfx/Library_basegfx.mk|1
basegfx/source/numeric/ftools.cxx | 57 --
include/basegfx/numeric/ftools.hxx| 11 -
sc/source/core/opencl/opencl_device.cxx | 10 -
sc/source/ui/inc/printfun.hxx |7
sc/source/ui/unoobj/shapeuno.cxx |3
sc/source/ui/view/printfun.cxx| 116 +-
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 16 -
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 11 -
unusedcode.easy |4
10 files changed, 88 insertions(+), 148 deletions(-)
New commits:
commit de2beb35985c9112777d0ca4f5e953a5d494e6d2
Author: Armin Le Grand a...@apache.org
Date: Wed Feb 26 03:04:14 2014 +
Resolves: #i123672# Made data used in ScPrintFunc to prepare...
print preview dynamic
(cherry picked from commit 51dac483c90f5d33fab5f449c0915917540ef547)
Conflicts:
sc/source/ui/inc/printfun.hxx
sc/source/ui/view/printfun.cxx
Change-Id: I1ec4b29821a958f8ca95d8e770de9971fbc47bae
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 59bb0ded..a0306b0 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -188,9 +188,10 @@ private:
SCCOL nEndCol;
SCROW nEndRow;
-SCCOL* pPageEndX; // page layout
-SCROW* pPageEndY;
-ScPageRowEntry* pPageRows;
+std::vector SCCOL maPageEndX;
+std::vector SCROW maPageEndY;
+std::vector ScPageRowEntrymaPageRows;
+
size_t nPagesX;
size_t nPagesY;
size_t nTotalY;
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index c09e8cc..53b61b2 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -842,7 +842,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const
OUString aPropertyName )
}
else
{
-GetShapePropertySet();
+if(!pShapePropertySet) //performance consideration
+GetShapePropertySet();
if (pShapePropertySet)
aAny = pShapePropertySet-getPropertyValue( aPropertyName );
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index fe44102..ab56da2 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -181,9 +181,6 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions
)
// else, EditEngine outputs different text heights
pDev-SetMapMode(MAP_PIXEL);
-pPageEndX = NULL;
-pPageEndY = NULL;
-pPageRows = NULL;
pBorderItem = NULL;
pBackgroundItem = NULL;
pShadowItem = NULL;
@@ -331,8 +328,25 @@ void ScPrintFunc::FillPageData()
rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab,
nEndCol, nEndRow, nPrintTab ) );
-rData.SetPagesX( nPagesX, pPageEndX );
-rData.SetPagesY( nTotalY, pPageEndY );
+// #i123672#
+if(maPageEndX.empty())
+{
+OSL_ENSURE(false, vector access error for maPageEndX (!));
+}
+else
+{
+rData.SetPagesX( nPagesX, maPageEndX[0]);
+}
+
+// #i123672#
+if(maPageEndY.empty())
+{
+OSL_ENSURE(false, vector access error for maPageEndY (!));
+}
+else
+{
+rData.SetPagesY( nTotalY, maPageEndY[0]);
+}
// Settings
rData.SetTopDown( aTableParam.bTopDown );
@@ -342,9 +356,6 @@ void ScPrintFunc::FillPageData()
ScPrintFunc::~ScPrintFunc()
{
-delete[] pPageEndX;
-delete[] pPageEndY;
-delete[] pPageRows;
delete pEditDefaults;
delete pEditEngine;
@@ -2439,7 +2450,10 @@ long ScPrintFunc::CountPages()
// sets also nPagesX, nP
CalcZoom(i);
if ( aTableParam.bSkipEmpty )
for (nY=0; nYnPagesY; nY++)
-nPages += pPageRows[nY].CountVisible();
+{
+OSL_ENSURE(nY maPageRows.size(), vector access
error for maPageRows (!));
+nPages += maPageRows[nY].CountVisible();
+}
else
nPages += ((long) nPagesX) * nPagesY;
if ( pPageData )
@@ -2451,7 +2465,10 @@ long ScPrintFunc::CountPages()
// sets also nPagesX, nP
CalcZoom(RANGENO_NORANGE); // calculate Zoom
if ( aTableParam.bSkipEmpty )
for (nY=0; nYnPagesY; nY++)
-nPages += pPageRows[nY].CountVisible();
+{
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/dac483c90f5d33fab5f449c0915917540ef547
51/dac483c90f5d33fab5f449c0915917540ef547 |1 + 1 file changed, 1 insertion(+) New commits: commit f3d4dce6fcfc14117c8d4052297b71cc5fe7e73b Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 11:51:39 2014 + Notes added by 'git notes add' diff --git a/51/dac483c90f5d33fab5f449c0915917540ef547 b/51/dac483c90f5d33fab5f449c0915917540ef547 new file mode 100644 index 000..f4186ce --- /dev/null +++ b/51/dac483c90f5d33fab5f449c0915917540ef547 @@ -0,0 +1 @@ +merged as: de2beb35985c9112777d0ca4f5e953a5d494e6d2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 19/8bb3b623d4c9fc82effdde98b6aea6dfb53af6
19/8bb3b623d4c9fc82effdde98b6aea6dfb53af6 |1 + 1 file changed, 1 insertion(+) New commits: commit 035848e142d9b5b9bd4930a97180278a8a54b051 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 11:52:53 2014 + Notes added by 'git notes add' diff --git a/19/8bb3b623d4c9fc82effdde98b6aea6dfb53af6 b/19/8bb3b623d4c9fc82effdde98b6aea6dfb53af6 new file mode 100644 index 000..9b77387 --- /dev/null +++ b/19/8bb3b623d4c9fc82effdde98b6aea6dfb53af6 @@ -0,0 +1 @@ +merged as: 3edcdd43f94e605c08314ab61f64c418b01f8dde ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - vcl/coretext
vcl/coretext/ctlayout.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 5e142d7ebb0803a04951dc8b478f59d5cc606389
Author: Herbert Dürr h...@apache.org
Date: Thu Feb 20 13:52:52 2014 +
fdo#64957: #i124233# prevent the accumulation of rounding errors
in CTLayout::FillDXArry()
Change-Id: I492c39bcb32527001aba5054a33c81f5d979adbf
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 743d66f..72949a0 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -385,9 +385,8 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
long nPixWidth = GetTextWidth();
if( pDXArray ) {
-// initialize the result array
-for( int i = 0; i mnCharCount; ++i)
-pDXArray[i] = 0;
+// prepare the sub-pixel accurate logical-width array
+::std::vectorfloat aWidthVector( mnCharCount );
//Â handle each glyph run
CFArrayRef aGlyphRuns = CTLineGetGlyphRuns( mpCTLine );
const int nRunCount = CFArrayGetCount( aGlyphRuns );
@@ -405,9 +404,18 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
CTRunGetStringIndices( pGlyphRun, aFullRange, aIndexVec[0] );
for( int i = 0; i != nGlyphCount; ++i ) {
const int nRelIdx = aIndexVec[i];
-pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width);
+aWidthVector[nRelIdx] += aSizeVec[i].width;
}
}
+
+// convert the sub-pixel accurate array into classic pDXArray integers
+float fWidthSum = 0.0;
+sal_Int32 nOldDX = 0;
+for( int i = 0; i mnCharCount; ++i) {
+const sal_Int32 nNewDX = rint( fWidthSum += aWidthVector[i]);
+pDXArray[i] = nNewDX - nOldDX;
+nOldDX = nNewDX;
+}
}
return nPixWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxsdrexport.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 3c0a7cf4f67720f2cca2c4eb543f838d5b644e7f
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date: Mon Feb 24 14:25:09 2014 +0530
fdo#75254 Unsupported shape in DML writing was causing document corruption.
Added a way to avoid DML export for un-supported shapes. We need to fix
those properly by adding proper support.
Change-Id: I0aeac1cc3b6e807a0427df9a9695446148d2ba38
Reviewed-on: https://gerrit.libreoffice.org/8202
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 170be93..bb771c8 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -103,6 +103,7 @@ struct DocxSdrExport::Impl
/// Writes wp wrapper code around an SdrObject, which itself is written
using drawingML syntax.
void writeDMLDrawing(const SdrObject* pSdrObj, const SwFrmFmt* pFrmFmt,
int nAnchorId);
void textFrameShadow(const SwFrmFmt rFrmFmt);
+bool
isSupportedDMLShape(com::sun::star::uno::Referencecom::sun::star::drawing::XShape
xShape);
};
DocxSdrExport::DocxSdrExport(DocxExport rExport, sax_fastparser::FSHelperPtr
pSerializer, oox::drawingml::DrawingML* pDrawingML)
@@ -549,6 +550,17 @@ void DocxSdrExport::Impl::textFrameShadow(const SwFrmFmt
rFrmFmt)
FSEND);
}
+bool DocxSdrExport::Impl::isSupportedDMLShape(uno::Referencedrawing::XShape
xShape)
+{
+bool supported = true;
+
+uno::Referencelang::XServiceInfo xServiceInfo(xShape,
uno::UNO_QUERY_THROW);
+if (xServiceInfo-supportsService(com.sun.star.drawing.PolyPolygonShape))
+supported = false;
+
+return supported;
+}
+
void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const
SwFrmFmt rFrmFmt,const Point rNdTopLeft, int nAnchorId)
{
// Depending on the shape type, we actually don't write the shape as DML.
@@ -557,7 +569,7 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject*
sdrObj, const SwFrmFm
uno::Referencedrawing::XShape
xShape(const_castSdrObject*(sdrObj)-getUnoShape(), uno::UNO_QUERY_THROW);
MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType(xShape,
nMirrorFlags, sShapeType);
-if (eShapeType != ESCHER_ShpInst_TextPlainText)
+if (eShapeType != ESCHER_ShpInst_TextPlainText
m_pImpl-isSupportedDMLShape(xShape))
{
m_pImpl-m_pSerializer-startElementNS(XML_mc, XML_AlternateContent,
FSEND);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/coretext
vcl/coretext/ctlayout.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit eb35d71c2cb46d066b42be49b7749d96a647b50f
Author: Herbert Dürr h...@apache.org
Date: Thu Feb 20 13:52:52 2014 +
fdo#64957: #i124233# prevent the accumulation of rounding errors
in CTLayout::FillDXArry()
Change-Id: Ifb4f16fb76f67d5b5c96fdb0545c64eb8316aa3c
Reviewed-on: https://gerrit.libreoffice.org/8359
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 0e9a6e0..d248c48 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -369,9 +369,8 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
long nPixWidth = GetTextWidth();
if( pDXArray ) {
-// initialize the result array
-for( int i = 0; i mnCharCount; ++i)
-pDXArray[i] = 0;
+// prepare the sub-pixel accurate logical-width array
+::std::vectorfloat aWidthVector( mnCharCount );
// handle each glyph run
CFArrayRef aGlyphRuns = CTLineGetGlyphRuns( mpCTLine );
const int nRunCount = CFArrayGetCount( aGlyphRuns );
@@ -389,9 +388,18 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
CTRunGetStringIndices( pGlyphRun, aFullRange, aIndexVec[0] );
for( int i = 0; i != nGlyphCount; ++i ) {
const int nRelIdx = aIndexVec[i];
-pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width);
+aWidthVector[nRelIdx] += aSizeVec[i].width;
}
}
+
+// convert the sub-pixel accurate array into classic pDXArray integers
+float fWidthSum = 0.0;
+sal_Int32 nOldDX = 0;
+for( int i = 0; i mnCharCount; ++i) {
+const sal_Int32 nNewDX = rint( fWidthSum += aWidthVector[i]);
+pDXArray[i] = nNewDX - nOldDX;
+nOldDX = nNewDX;
+}
}
return nPixWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Vertical text alignment for frames
Hi there, I'm working on a new feature and I'd like to ask for some advise about the UI part. The feature I'm speaking about is text vertical alignment for frames (Insert - Frame). This text alignment works for drawing elements (shapes, text boxes) and for table cells, but not for frames. I think we can use the same combo box which we use for table (Table context menu - Table - Text flow - Alignment). I see two places where it can be added: 1. In Frame dialog - Type tab: http://people.inf.elte.hu/zotsaai/type.png 2. In Frame dialog - Options tab: http://people.inf.elte.hu/zotsaai/option.png I changed the label from Alignment to Text alignment because it can be ambiguous in the new context. So I have these ideas, but I need ux guys' suggestions for final decision. Thanks Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |5 - 1 file changed, 5 deletions(-) New commits: commit bf4352f0d1c8fd26ff45145eafddc43344c5a89d Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Feb 25 19:24:12 2014 +0100 Do not have two help strings for the same. Change-Id: Icae6446494df835a5f636d7a139220997026fa85 diff --git a/configure.ac b/configure.ac index c6da52b..4bf51b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1500,11 +1500,6 @@ AC_ARG_WITH(system-expat, [Use expat already on system.]),, [with_system_expat=$with_system_libs]) -AC_ARG_WITH(system-libeot, -AS_HELP_STRING([--with-system-libeot], -[Use libeot already on system.]),, -[with_system_libeot=$with_system_libs]) - AC_ARG_WITH(system-libxml, AS_HELP_STRING([--with-system-libxml], [Use libxml/libxslt already on system.]),, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/test_msword_hang.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9
sw/source/filter/ww8/docxsdrexport.cxx | 37 ++--
sw/source/filter/ww8/docxsdrexport.hxx |2 +
4 files changed, 46 insertions(+), 2 deletions(-)
New commits:
commit 7e92d9881f039899262882633712ec0a3de01474
Author: Tushar Bende tushar.be...@synerzip.com
Date: Wed Feb 26 15:34:58 2014 +0530
fdo#74771 : LibreOffice image captions crash MS Office Word
There was a problem if
1)Document is created in MS word
2)then opened in Libreoffice and edited by adding Image and Caption
3)saved back to docx format
4)Attempt to open the DOCX file in Word. Word was crashing.
Problem was if any doc is edited in LO by adding image and Caption LO
adds image as anchored inside TextBox.
Which MS word doesn't support(Anchored image inside TextBox).
Verified code changes on both MSWord2007 MSWord2010 as it was
crashing both earlier.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8354
Change-Id: I621d0c5e3acbf9e1fc8514aa70110aa863748ceb
diff --git a/sw/qa/extras/ooxmlexport/data/test_msword_hang.docx
b/sw/qa/extras/ooxmlexport/data/test_msword_hang.docx
new file mode 100644
index 000..cae7814
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/test_msword_hang.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4d6e3b7..fb314fd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3726,6 +3726,15 @@
DECLARE_OOXMLEXPORT_TEST(testBibliography,FDO75133.docx)
CPPUNIT_ASSERT(contents.match( BIBLIOGRAPHY ));
}
+DECLARE_OOXMLEXPORT_TEST(testMSwordHang,test_msword_hang.docx)
+{
+// fdo#74771:
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
/w:document/w:body/w:p[2]/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p/w:r[2]/w:drawing/wp:inline,
distT, 0);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index bb771c8..94b598e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -71,6 +71,7 @@ struct DocxSdrExport::Impl
sax_fastparser::FastAttributeList* m_pTextboxAttrList;
OStringBuffer m_aTextFrameStyle;
bool m_bFrameBtLr;
+bool m_bFlyFrameGraphic;
sax_fastparser::FastAttributeList* m_pFlyFillAttrList;
sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
sax_fastparser::FastAttributeList* m_pBodyPrAttrList;
@@ -87,6 +88,7 @@ struct DocxSdrExport::Impl
m_pFlyAttrList(0),
m_pTextboxAttrList(0),
m_bFrameBtLr(false),
+ m_bFlyFrameGraphic(false),
m_pFlyFillAttrList(0),
m_pFlyWrapAttrList(0),
m_pBodyPrAttrList(0),
@@ -165,6 +167,16 @@ void DocxSdrExport::setFrameBtLr(bool bFrameBtLr)
m_pImpl-m_bFrameBtLr = bFrameBtLr;
}
+bool DocxSdrExport::getFlyFrameGraphic()
+{
+return m_pImpl-m_bFlyFrameGraphic;
+}
+
+void DocxSdrExport::setFlyFrameGraphic(bool bFlyFrameGraphic)
+{
+m_pImpl-m_bFlyFrameGraphic = bFlyFrameGraphic;
+}
+
sax_fastparser::FastAttributeList* DocxSdrExport::getFlyFillAttrList()
{
return m_pImpl-m_pFlyFillAttrList;
@@ -197,7 +209,16 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
const SvxLRSpaceItem pLRSpaceItem = pFrmFmt-GetLRSpace(false);
const SvxULSpaceItem pULSpaceItem = pFrmFmt-GetULSpace(false);
-bool isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+bool isAnchor;
+
+if (m_pImpl-m_bFlyFrameGraphic)
+{
+isAnchor = false; // make Graphic object inside DMLTextFrame
VMLTextFrame as Inline
+}
+else
+{
+isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+}
if (isAnchor)
{
::sax_fastparser::FastAttributeList* attrList =
m_pImpl-m_pSerializer-createAttrList();
@@ -415,7 +436,15 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
void DocxSdrExport::endDMLAnchorInline(const SwFrmFmt* pFrmFmt)
{
-bool isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+bool isAnchor;
+if (m_pImpl-m_bFlyFrameGraphic)
+{
+isAnchor = false; // end Inline Graphic object inside DMLTextFrame
+}
+else
+{
+isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+}
m_pImpl-m_pSerializer-endElementNS(XML_wp, isAnchor ? XML_anchor :
XML_inline);
m_pImpl-m_pSerializer-endElementNS(XML_w, XML_drawing);
@@ -944,7 +973,9 @@ void
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
|8 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
|4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
|4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java
|4 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
|8 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
| 10 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
| 30 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
| 10 +--
12 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit c2a0a2bb49ac09e9fe63317cedaba85096b33cd3
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 23:12:58 2014 +0100
Remove visual noise from xmerge
Change-Id: I74b5e30d08ade403ec35298d5c783f02b22e886a
Reviewed-on: https://gerrit.libreoffice.org/8343
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 9912cb6..883d137 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -192,7 +192,7 @@ public class Convert implements Cloneable {
if (toOffice) {
// From device format to Office format
-//
+
DocumentDeserializerFactory myDocDeserializerFactory =
ci.getDocDeserializerFactory();
DocumentDeserializer deser =
@@ -206,7 +206,7 @@ public class Convert implements Cloneable {
} else {
// From Office format to device format
-//
+
DocumentSerializerFactory myDocSerializerFactory =
ci.getDocSerializerFactory();
@@ -244,7 +244,7 @@ public class Convert implements Cloneable {
if (toOffice) {
// From device format to Office format
-//
+
DocumentDeserializerFactory myDocDeserializerFactory =
ci.getDocDeserializerFactory();
DocumentDeserializer deser =
@@ -260,7 +260,7 @@ public class Convert implements Cloneable {
} else {
// From Office format to device format
-//
+
DocumentSerializerFactory myDocSerializerFactory =
ci.getDocSerializerFactory();
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 80d42f5..986e539 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -231,7 +231,7 @@ public class ParaStyle extends Style implements Cloneable {
// Look for children. Only ones we care about are style:properties
// nodes. If any are found, recursively traverse them, passing
// along the style element to add properties to.
-//
+
if (node.hasChildNodes()) {
NodeList children = node.getChildNodes();
int len = children.getLength();
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
index fcdaba4..fd01ec8 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
@@ -133,12 +133,12 @@ public class DocumentMergerImpl implements DocumentMerger
{
Node workSheet= workSheetList2.item(j);
// try to match the workSheet
-//
+
Node matchingWorkSheet = matchWorkSheet(workSheet, workSheetList1);
// add the new WorkSheet to the original document iff match not
// found
-//
+
if (matchingWorkSheet == null) {
Node cloneNode = XmlUtil.deepClone(officeBody, workSheet);
Re: Vertical text alignment for frames
Hi Tamás, Tamas Zolnai schrieb: Hi there, I'm working on a new feature and I'd like to ask for some advise about the UI part. The feature I'm speaking about is text vertical alignment for frames (Insert - Frame). This text alignment works for drawing elements (shapes, text boxes) and for table cells, but not for frames. I think we can use the same combo box which we use for table (Table context menu - Table - Text flow - Alignment). I see two places where it can be added: 1. In Frame dialog - Type tab: http://people.inf.elte.hu/zotsaai/type.png 2. In Frame dialog - Options tab: http://people.inf.elte.hu/zotsaai/option.png I changed the label from Alignment to Text alignment because it can be ambiguous in the new context. So I have these ideas, but I need ux guys' suggestions for final decision. It is not clear, what the new property does. * A frame can contain nearly a whole document including headings, paragraph, tables, graphic, or sections. * The content of a frame may float to a linked frame. * The height of a frame is often fitting to content. * The frame content is sensible to the compatibility settings regarding spacing. * Register true might be enabled. So what is vertical alignment specified to do? Exists an attribute for this in ODF? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/dmapper/DomainMapper.hxx |2 +-
writerfilter/source/dmapper/BorderHandler.hxx |2 +-
writerfilter/source/dmapper/CellColorHandler.hxx |2 +-
writerfilter/source/dmapper/CellMarginHandler.hxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +-
writerfilter/source/dmapper/FieldTypes.hxx |2 +-
writerfilter/source/dmapper/FontTable.hxx |2 +-
writerfilter/source/dmapper/GraphicImport.hxx |2 +-
writerfilter/source/dmapper/MeasureHandler.hxx |2 +-
writerfilter/source/dmapper/ModelEventListener.hxx |2 +-
writerfilter/source/dmapper/NumberingManager.cxx |2 +-
writerfilter/source/dmapper/OLEHandler.hxx |2 +-
writerfilter/source/dmapper/SectionColumnHandler.hxx |2 +-
writerfilter/source/dmapper/SettingsTable.hxx |2 +-
writerfilter/source/dmapper/StyleSheetTable.hxx|4 ++--
writerfilter/source/dmapper/TDefTableHandler.hxx |2 +-
writerfilter/source/dmapper/TablePropertiesHandler.cxx |2 +-
writerfilter/source/dmapper/ThemeTable.hxx |2 +-
writerfilter/source/dmapper/TrackChangesHandler.hxx|2 +-
19 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 8440c9ed92561c307bfab131c7de7144ed24100b
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 23:10:59 2014 +0100
Remove visual noise from writerfilter
Change-Id: I2470e26f1b0a7c3b28fbc0ec44170565f250fc40
Reviewed-on: https://gerrit.libreoffice.org/8342
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index ce30d69..0a9ecbe 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -174,6 +174,6 @@ private:
} // namespace dmapper
} // namespace writerfilter
-#endif //
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx
b/writerfilter/source/dmapper/BorderHandler.hxx
index 7b52962..efe2909 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -78,6 +78,6 @@ public:
typedef boost::shared_ptr BorderHandler BorderHandlerPtr;
}}
-#endif //
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx
b/writerfilter/source/dmapper/CellColorHandler.hxx
index 1683d50..fbfef52 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -64,6 +64,6 @@ public:
typedef boost::shared_ptr CellColorHandler CellColorHandlerPtr;
}}
-#endif //
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx
b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 902ef80..24be82b 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -67,6 +67,6 @@ public:
typedef boost::shared_ptr CellMarginHandler CellMarginHandlerPtr;
}}
-#endif //
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6e4d439..f86fbd5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1038,10 +1038,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
}
}
-else //
+else
{
// (1) doesn't need handling
-//
+
if( !bIsDropCap pParaContext-IsFrameMode() )
{
pToBeSavedProperties.reset( new
ParagraphProperties(*pParaContext) );
@@ -1258,7 +1258,7 @@ void DomainMapper_Impl::appendOLE( const OUString
rStreamName, OLEHandlerPtr pO
RemoveLastParagraph();
m_aTextAppendStack.pop();
-//
+
appendTextContent( xOLE, uno::Sequence beans::PropertyValue () );
}
@@ -3717,9 +3717,9 @@ void DomainMapper_Impl::PopFieldContext()
OSL_FAIL( exception in PopFieldContext() );
}
}
-//
+
//TOCs have to include all the imported content
-//...
+
}
//remove the field context
m_aFieldStack.pop();
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx
b/writerfilter/source/dmapper/FieldTypes.hxx
index 2a54dfe..9d3d360 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/writerfilter/source/dmapper/FieldTypes.hxx
@@ -176,7 +176,7 @@ enum FieldId
\w paragraph number in full context
\*
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/msforms/service.cxx |4 ++-- vbahelper/source/msforms/vbacombobox.hxx |2 +- vbahelper/source/msforms/vbalistbox.hxx |2 +- vbahelper/source/msforms/vbalistcontrolhelper.cxx|2 +- vbahelper/source/msforms/vbanewfont.cxx |4 ++-- vbahelper/source/msforms/vbanewfont.hxx |4 ++-- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx |4 ++-- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx |2 +- vbahelper/source/vbahelper/vbaeventshelperbase.cxx |4 ++-- vbahelper/source/vbahelper/vbahelper.cxx |2 +- 10 files changed, 15 insertions(+), 15 deletions(-) New commits: commit d304c532e8450d0e68d4275468c2f6ed9a68a6c3 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 22:49:25 2014 +0100 Remove visual noise from vbahelper Change-Id: I068c2a73a3ae487aff7c5451545d3e0aee50b1da Reviewed-on: https://gerrit.libreoffice.org/8338 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 5a9120f..1fbde40 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -21,9 +21,9 @@ #include com/sun/star/registry/XRegistryKey.hpp #include comphelper/servicedecl.hxx -// = + // component exports -// = + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 1edb0fa..e157772 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -87,6 +87,6 @@ public: virtual css::uno::SequenceOUString getServiceNames(); }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index a6addc0..1fc0678 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -79,6 +79,6 @@ public: }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index 70e0b66..1abae82 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -128,7 +128,7 @@ ListControlHelper::AddItem( const uno::Any pvargItem, const uno::Any pvargInde std::vector OUString ::iterator it = sVec.begin(); for ( ; pString != pEndString; ++pString, ++it) *pString = *it; -// + } m_xProps-setPropertyValue( ITEMS, uno::makeAny( sList ) ); diff --git a/vbahelper/source/msforms/vbanewfont.cxx b/vbahelper/source/msforms/vbanewfont.cxx index c4b5472..a2e64f5 100644 --- a/vbahelper/source/msforms/vbanewfont.cxx +++ b/vbahelper/source/msforms/vbanewfont.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -// + VbaNewFont::VbaNewFont( const uno::Reference XHelperInterface rxParent, @@ -136,6 +136,6 @@ void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough ) throw (uno VBAHELPER_IMPL_XHELPERINTERFACE( VbaNewFont, ooo.vba.msforms.NewFont ) -// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx index 5ce9409..d948604 100644 --- a/vbahelper/source/msforms/vbanewfont.hxx +++ b/vbahelper/source/msforms/vbanewfont.hxx @@ -23,7 +23,7 @@ #include ooo/vba/msforms/XNewFont.hpp #include vbahelper/vbahelperinterface.hxx -// + typedef InheritedHelperInterfaceImpl1 ov::msforms::XNewFont VbaNewFont_BASE; @@ -60,7 +60,7 @@ private: css::uno::Reference css::beans::XPropertySet mxProps; }; -// + #endif diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index f2d3a7d..3f6efe2c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -193,7 +193,7 @@ ScVbaCommandBarControl::getServiceNames() return aServiceNames; } - ScVbaCommandBarPopup // +// ScVbaCommandBarPopup ScVbaCommandBarPopup::ScVbaCommandBarPopup( const
[Libreoffice-commits] core.git: unoxml/qa unoxml/source
unoxml/qa/complex/unoxml/DOMTest.java | 18 +++
unoxml/source/dom/document.cxx |2 -
unoxml/source/rdf/librdf_repository.cxx | 38
3 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit d952ba2a7505021066d7fe5a01f14a02135edb65
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 22:47:02 2014 +0100
Remove visual noise from unoxml
Change-Id: I405f2df6621197effd7e2b19844fe4d0bf7f58aa
Reviewed-on: https://gerrit.libreoffice.org/8335
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/unoxml/qa/complex/unoxml/DOMTest.java
b/unoxml/qa/complex/unoxml/DOMTest.java
index ed4374c..3a44eaf 100644
--- a/unoxml/qa/complex/unoxml/DOMTest.java
+++ b/unoxml/qa/complex/unoxml/DOMTest.java
@@ -386,7 +386,7 @@ public class DOMTest
}
}
-// XNode
+// XNode
{
XNode xDocCloneN = xDoc.cloneNode(false);
@@ -579,7 +579,7 @@ public class DOMTest
xDF.appendChild(xElemFoo);
-// XNode
+// XNode
XText xText = xDoc.createTextNode(foo);
XComment xComment = xDoc.createComment(foo);
@@ -933,7 +933,7 @@ public class DOMTest
assertNull(XElement.removeAttributeNS,
xElemFooNs.getAttributeNodeNS(ns, foo));
-// XNode
+// XNode
XText xText = xDoc.createTextNode(foo);
XComment xComment = xDoc.createComment(foo);
@@ -1182,7 +1182,7 @@ public class DOMTest
xAttr.setValue(bar);
assertEquals(XAttr.setValue(), bar, xAttr.getValue());
-// XNode
+// XNode
{
XNode xAttrCloneN = xAttr.cloneNode(false);
@@ -1438,7 +1438,7 @@ public class DOMTest
}
assertEquals(XText.subStringData, x, xText.subStringData(3, 1));
-// XNode
+// XNode
{
XNode xTextCloneN = xText.cloneNode(false);
@@ -1622,7 +1622,7 @@ public class DOMTest
assertEquals(XCDATASection.subStringData, x,
xCDS.subStringData(3, 1));
-// XNode
+// XNode
{
XNode xCDSCloneN = xCDS.cloneNode(false);
@@ -1796,7 +1796,7 @@ public class DOMTest
assertEquals(XComment.subStringData, x,
xComment.subStringData(3, 1));
-// XNode
+// XNode
{
XNode xCommentCloneN = xComment.cloneNode(false);
@@ -1923,7 +1923,7 @@ public class DOMTest
xER.appendChild(xERChild);
-// XNode
+// XNode
XText xText = xDoc.createTextNode(foo);
XComment xComment = xDoc.createComment(foo);
@@ -2130,7 +2130,7 @@ public class DOMTest
xPI.setData(baz);
assertEquals(XProcessingInstruction.setData, baz, xPI.getData());
-// XNode
+// XNode
{
XNode xPICloneN = xPI.cloneNode(false);
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 779b4c5..ff0306c 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -137,7 +137,7 @@ namespace DOM
// so a new CNode is created and inserted
// T1 calls removeCNode: i-second-second now points to a
// different CNode instance!
-//
+
// check that the CNode is the right one
CNode *const pCurrent = i-second.second;
if (pCurrent == pCNode) {
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index d56cfad..acaefb5 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -92,7 +92,7 @@ typedef std::map OUString,
::rtl::Referencelibrdf_NamedGraph
const char s_sparql [] = sparql;
const char s_nsOOo [] = http://openoffice.org/2004/office/rdfa/;;
-
+
//FIXME: this approach is not ideal. can we use blank nodes instead?
bool isInternalContext(librdf_node *i_pNode) throw ()
@@ -119,7 +119,7 @@ bool isInternalContext(librdf_node *i_pNode) throw ()
}
-
+
// n.b.: librdf destructor functions dereference null pointers!
// so they need to be wrapped to be usable with boost::shared_ptr.
@@ -170,7
[Libreoffice-commits] core.git: unodevtools/inc
unodevtools/inc/unodevtools/options.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3dd72c19eb2d640c48973f235578ed4cc5dab566
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 22:42:55 2014 +0100
Remove visual noise from unodevtools
Change-Id: Ib8047c4606874d5bc6ce024bf34ee518cc51581b
Reviewed-on: https://gerrit.libreoffice.org/8332
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/unodevtools/inc/unodevtools/options.hxx
b/unodevtools/inc/unodevtools/options.hxx
index 42e765e..0455cd9 100644
--- a/unodevtools/inc/unodevtools/options.hxx
+++ b/unodevtools/inc/unodevtools/options.hxx
@@ -26,12 +26,12 @@
namespace unodevtools {
-//---
+
bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString aArg);
// throws CannotDumpException
-//---
+
bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString aArg);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Kohei Yoshida libreoff...@kohei.us changed: What|Removed |Added Depends on|74087 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgcharacternode.hxx| 10 +-
svgio/inc/svgio/svgreader/svgcirclenode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgclippathnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgdocument.hxx |4 ++--
svgio/inc/svgio/svgreader/svgdocumenthandler.hxx |6 +++---
svgio/inc/svgio/svgreader/svgellipsenode.hxx |4 ++--
svgio/inc/svgio/svgreader/svggnode.hxx|4 ++--
svgio/inc/svgio/svgreader/svggradientnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svggradientstopnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgimagenode.hxx|4 ++--
svgio/inc/svgio/svgreader/svglinenode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgmarkernode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgmasknode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgnode.hxx |6 +++---
svgio/inc/svgio/svgreader/svgpaint.hxx|4 ++--
svgio/inc/svgio/svgreader/svgpathnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgpatternnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgpolynode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgrectnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgstyleattributes.hxx |6 +++---
svgio/inc/svgio/svgreader/svgstylenode.hxx|4 ++--
svgio/inc/svgio/svgreader/svgsvgnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgsymbolnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgtextnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgtextpathnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgtitledescnode.hxx|4 ++--
svgio/inc/svgio/svgreader/svgtoken.hxx|4 ++--
svgio/inc/svgio/svgreader/svgtools.hxx|4 ++--
svgio/inc/svgio/svgreader/svgtrefnode.hxx |4 ++--
svgio/inc/svgio/svgreader/svgtspannode.hxx|4 ++--
svgio/inc/svgio/svgreader/svgusenode.hxx |4 ++--
svgio/source/svgreader/svgcharacternode.cxx | 10 +-
svgio/source/svgreader/svgcirclenode.cxx |4 ++--
svgio/source/svgreader/svgclippathnode.cxx|4 ++--
svgio/source/svgreader/svgdocument.cxx|4 ++--
svgio/source/svgreader/svgdocumenthandler.cxx |8
svgio/source/svgreader/svgellipsenode.cxx |4 ++--
svgio/source/svgreader/svggnode.cxx |4 ++--
svgio/source/svgreader/svggradientnode.cxx|4 ++--
svgio/source/svgreader/svggradientstopnode.cxx|4 ++--
svgio/source/svgreader/svgimagenode.cxx |4 ++--
svgio/source/svgreader/svglinenode.cxx|4 ++--
svgio/source/svgreader/svgmarkernode.cxx |4 ++--
svgio/source/svgreader/svgmasknode.cxx|4 ++--
svgio/source/svgreader/svgpaint.cxx |4 ++--
svgio/source/svgreader/svgpathnode.cxx|4 ++--
svgio/source/svgreader/svgpatternnode.cxx |4 ++--
svgio/source/svgreader/svgpolynode.cxx|4 ++--
svgio/source/svgreader/svgrectnode.cxx|4 ++--
svgio/source/svgreader/svgstyleattributes.cxx |4 ++--
svgio/source/svgreader/svgstylenode.cxx |4 ++--
svgio/source/svgreader/svgsvgnode.cxx |6 +++---
svgio/source/svgreader/svgsymbolnode.cxx |4 ++--
svgio/source/svgreader/svgtextnode.cxx|4 ++--
svgio/source/svgreader/svgtextpathnode.cxx|6 +++---
svgio/source/svgreader/svgtitledescnode.cxx |4 ++--
svgio/source/svgreader/svgtoken.cxx |4 ++--
svgio/source/svgreader/svgtools.cxx |4 ++--
svgio/source/svgreader/svgtrefnode.cxx|4 ++--
svgio/source/svgreader/svgtspannode.cxx |4 ++--
svgio/source/svgreader/svgusenode.cxx |4 ++--
61 files changed, 135 insertions(+), 135 deletions(-)
New commits:
commit 65d6ecfd4e69c2f6b8346e8b655914d5ac5a0286
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:43:34 2014 +0100
Remove visual noise from svgio
Change-Id: I5295d5204c3f42b67b877aefba605dc22279eab0
Reviewed-on: https://gerrit.libreoffice.org/8318
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx
b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
index 5c0ffaf..bc5aea6 100644
--- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx
+++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
@@ -22,12 +22,12 @@
#include svgio/svgreader/svgnode.hxx
-//
+
// predefines
namespace drawinglayer { namespace primitive2d { class
TextSimplePortionPrimitive2D; }}
-//
+
namespace svgio
{
@@ -82,7 +82,7 @@ namespace svgio
} // end of namespace
[Libreoffice-commits] core.git: shell/inc shell/source
shell/inc/internal/columninfo.hxx |8 +-- shell/inc/internal/fileextensions.hxx |4 - shell/inc/internal/infotips.hxx | 16 +++--- shell/inc/internal/iso8601_converter.hxx |4 - shell/inc/internal/propertyhdl.hxx| 24 +- shell/inc/internal/propsheets.hxx | 12 ++--- shell/inc/internal/registry.hxx |4 - shell/inc/internal/thumbviewer.hxx| 16 +++--- shell/inc/internal/types.hxx |6 +- shell/inc/internal/utilities.hxx | 18 +++ shell/inc/internal/xml_parser.hxx |6 +- shell/source/backends/macbe/macbackend.mm | 16 +++--- shell/source/cmdmail/cmdmailmsg.hxx | 16 +++--- shell/source/cmdmail/cmdmailsuppl.hxx | 16 +++--- shell/source/tools/lngconvex/cmdline.hxx |2 shell/source/unix/exec/shellexec.hxx | 12 ++--- shell/source/unix/sysshell/recently_used_file.hxx | 14 ++--- shell/source/win32/SysShExec.hxx | 12 ++--- shell/source/win32/shlxthandler/classfactory.hxx |8 +-- shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx |2 shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx | 10 ++-- shell/source/win32/shlxthandler/ooofilt/propspec.hxx |6 +- shell/source/win32/shlxthandler/propsheets/document_statistic.hxx | 14 ++--- shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx|6 +- shell/source/win32/simplemail/smplmailmsg.hxx | 16 +++--- shell/source/win32/zipfile/zipexcptn.hxx | 12 ++--- 26 files changed, 140 insertions(+), 140 deletions(-) New commits: commit d18a2753d5a6e29312e08365f7d9a512a92b998e Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 20:36:36 2014 +0100 Remove visual noise from shell Change-Id: I1857fd7a9aeda38cb8ef2a0eda7783203b7658ed Reviewed-on: https://gerrit.libreoffice.org/8311 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx index 4f67b05..6832877 100644 --- a/shell/inc/internal/columninfo.hxx +++ b/shell/inc/internal/columninfo.hxx @@ -36,9 +36,9 @@ public: CColumnInfo(long RefCnt = 1); virtual ~CColumnInfo(); -//- + // IUnknown methods -//- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -48,9 +48,9 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); -//- + // IColumnProvider -//- + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCSHCOLUMNINIT psci); diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx index f1c8283..119c626 100644 --- a/shell/inc/internal/fileextensions.hxx +++ b/shell/inc/internal/fileextensions.hxx @@ -43,13 +43,13 @@ extern FileExtensionEntry OOFileExtensionTable[]; extern size_t OOFileExtensionTableSize; -//- + /** Return the extension of a file name without the '.' */ std::string get_file_name_extension(const std::string file_name); -//- + /** Return the type of a file */ diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx index 99eb760..ec6615a 100644 --- a/shell/inc/internal/infotips.hxx +++ b/shell/inc/internal/infotips.hxx @@ -37,9 +37,9 @@ public: CInfoTip(long RefCnt = 1); virtual ~CInfoTip(); -//- + // IUnknown methods -//- + virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, @@ -49,23 +49,23 @@ public: virtual ULONG STDMETHODCALLTYPE Release( void); -// + // IQueryInfo methods -// + virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, wchar_t** ppwszTip); virtual HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags); -// + // IPersist methods -// + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID* pClassID); -// + // IPersistFile methods -// + virtual HRESULT STDMETHODCALLTYPE IsDirty(void); diff --git
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3 Author: Michael Stahl mst...@redhat.com Date: Wed Feb 26 14:40:35 2014 +0100 fdo#75526: argh missing semicolon Change-Id: I4cabdcd3d4d5e4a446a4784d7a657655a4fbdfdc diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 0fc98a3..6680cb5 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -181,7 +181,7 @@ End TXT_FILE_BODY; \ Styles = (PACKED); \ Dir = gid_Dir_Lib_Sdk; \ -Name = name \ +Name = name; \ End #else #define SDK_LIBRARY_LINK(id,name,target) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/settings.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 844d1a89591df48a75a93e2db53e369175428d51 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 26 15:00:32 2014 +0100 sal_Bool - bool fixup Change-Id: I1104fc57f9f82944d258208f70993da1b00f1843 diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 2eeef09..991f9de 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -171,7 +171,7 @@ struct ImplStyleData sal_uLong mnLogoDisplayTime; sal_uLong mnDisplayOptions; sal_uLong mnToolbarIconSize; -sal_uLong mnUseFlatMenus; +boolmnUseFlatMenus; sal_uLong mnOptions; sal_uInt16 mnScreenZoom; sal_uInt16 mnScreenFontZoom; @@ -179,7 +179,7 @@ struct ImplStyleData boolmbUseSystemUIFonts; boolmbAutoMnemonic; TriStatemeUseImagesInMenus; -sal_uLong mnUseFlatBorders; +boolmnUseFlatBorders; boolmbPreferredUseImagesInMenus; longmnMinThumbSize; boost::shared_ptrvcl::IconThemeScanner @@ -879,9 +879,9 @@ void ImplStyleData::SetStandardStyles() mnTearOffTitleHeight= 8; mnMenuBarHeight = 14; mbHighContrast = false; -mbUseSystemUIFonts = 1; -mnUseFlatBorders= 0; -mnUseFlatMenus = 0; +mbUseSystemUIFonts = true; +mnUseFlatBorders= false; +mnUseFlatMenus = false; mbPreferredUseImagesInMenus = true; mbSkipDisabledInMenus = false; mbHideDisabledMenuItems = false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source sax/test
sax/source/expatwrap/sax_expat.cxx |4 ++--
sax/source/expatwrap/saxwriter.cxx |2 +-
sax/source/expatwrap/xml2utf.cxx |8
sax/source/fastparser/fastparser.cxx |6 +++---
sax/test/saxdemo.cxx |4 ++--
sax/test/testcomponent.cxx |4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ff0562fa4f7d8b7aceca16771d84db87d3f19756
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:53:41 2014 +0100
Remove visual noise from sax
Change-Id: Ica31580f72b43456c33b2f6abbf2140a79efae1a
Reviewed-on: https://gerrit.libreoffice.org/8299
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 9719335..f19305f 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -759,9 +759,9 @@ void SaxExpatParser_Impl::parse( )
}
-//
+
// The C-Callbacks
-//
+
void SaxExpatParser_Impl::callbackStartElement( void *pvThis ,
const XML_Char *pwName ,
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index d871cce..cd8cf23 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -806,7 +806,7 @@ inline sal_Int32 calcXMLByteLength( const sal_Unicode
*pStr, sal_Int32 nStrLen,
case 9: // #x09;
if( bNormalizeWhitespace )
{
-nOutputLength += 6; //
+nOutputLength += 6;
}
else
{
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 6c5fece..b390912 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -344,9 +344,9 @@ void XMLFile2UTFConverter::initializeDecoding()
-//
+
// Text2UnicodeConverter
-//
+
Text2UnicodeConverter::Text2UnicodeConverter( const OString sEncoding )
{
@@ -450,9 +450,9 @@ Sequencesal_Unicode Text2UnicodeConverter::convert( const
Sequencesal_Int8
-//
+
// Unicode2TextConverter
-//
+
Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding )
{
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index ba63596..2e26c50 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -607,7 +607,7 @@ void Entity::throwException( const ::rtl::Reference
FastLocatorImpl xDocumen
// In the single threaded case we emit events via our C
// callbacks, so any exception caught must be queued up until
// we can safely re-throw it from our C++ parent of parse()
-//
+
// If multi-threaded, we need to push an EXCEPTION event, at
// which point we transfer ownership of maSavedException to
// the consuming thread.
@@ -1087,9 +1087,9 @@ void FastSaxParserImpl::parse()
}
-//
+
// The C-Callbacks
-//
+
void FastSaxParserImpl::callbackStartElement( const XML_Char* pwName, const
XML_Char** awAttributes )
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index eb89b67..0c1ec2f 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -21,9 +21,9 @@
// testcomponent - Loads a service and its testcomponent from dlls performs a
test.
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
-//
+
// Therefor the testcode must exist in teststm and the testservice must be
named test.com.sun.star.uno.io.Pipe
-//
+
#include stdio.h
#include vector
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index a0ca81f..b979603 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -21,9 +21,9 @@
// testcomponent - Loads a service and its testcomponent from dlls performs a
test.
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
-//
+
// Therefor the testcode must exist in teststm and the testservice must be
named com.sun.star.io.Pipe
-//
+
#include stdio.h
#include com/sun/star/registry/XImplementationRegistration.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/win32/customactions/tools/seterror.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d023b7f7d7fc7e8f91b779f4f2dcb919cf38b82a Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 20:32:29 2014 +0100 Remove visual noise from setup_native Change-Id: I565cdc2f5447f4387f0e01f22e49bc589c40cb60 Reviewed-on: https://gerrit.libreoffice.org/8309 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx index f87aa5f..89cb097 100644 --- a/setup_native/source/win32/customactions/tools/seterror.hxx +++ b/setup_native/source/win32/customactions/tools/seterror.hxx @@ -20,7 +20,7 @@ #ifndef _SETERROR_HXX_ #define _SETERROR_HXX_ -//-- + // list of own error codes #define MSI_ERROR_NEW_VERSION_FOUND 9010 @@ -28,7 +28,7 @@ #define MSI_ERROR_DIRECTORY_NOT_EMPTY 9030 -//-- + void SetMsiErrorCode( int nErrorCode ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/minimizer/graphiccollector.hxx|6 +++---
sdext/source/minimizer/impoptimizer.cxx| 12 ++--
sdext/source/minimizer/impoptimizer.hxx|4 ++--
sdext/source/minimizer/informationdialog.hxx |4 ++--
sdext/source/minimizer/optimizerdialog.hxx | 18 +-
sdext/source/minimizer/pppoptimizer.cxx| 20 ++--
sdext/source/minimizer/pppoptimizer.hxx|4 ++--
sdext/source/minimizer/pppoptimizerdialog.hxx |6 +++---
sdext/source/minimizer/unodialog.hxx |6 +++---
sdext/source/pdfimport/filterdet.cxx |2 +-
sdext/source/pdfimport/tree/drawtreevisiting.cxx |4 ++--
sdext/source/pdfimport/tree/writertreevisiting.cxx |4 ++--
12 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit e6bd9d718d9962bbb88428a31173fa607f46d45c
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:30:17 2014 +0100
Remove visual noise from sdext
Change-Id: I792249b9e92db9af4daee0bd835e04044d29bca5
Reviewed-on: https://gerrit.libreoffice.org/8308
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/minimizer/graphiccollector.hxx
b/sdext/source/minimizer/graphiccollector.hxx
index 3cc0b7d..d1d37a3 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -69,7 +69,7 @@ class GraphicCollector
struct GraphicEntity
{
com::sun::star::awt::Size maLogicalSize;
// the biggest logical size the graphic will be displayed
-sal_BoolmbRemoveCropArea;
//
+sal_BoolmbRemoveCropArea;
com::sun::star::text::GraphicCrop maGraphicCropLogic;
std::vector GraphicUser maUser;
@@ -89,9 +89,9 @@ class GraphicCollector
const GraphicSettings rGraphicSettings, sal_Int32 rGraphics );
};
-//
+
// - GRAPHICCOLLECTOR -
-//
+
#endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_GRAPHICCOLLECTOR_HXX
diff --git a/sdext/source/minimizer/impoptimizer.cxx
b/sdext/source/minimizer/impoptimizer.cxx
index f19133c..c2eceef 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -481,9 +481,9 @@ void CompressGraphics( ImpOptimizer rOptimizer, const
Reference XComponentCont
}
}
-//
+
// - ImpOptimizer -
-//
+
ImpOptimizer::ImpOptimizer( const Reference XComponentContext rxContext,
const Reference XModel rxModel ) :
mxContext ( rxContext ),
@@ -502,13 +502,13 @@ ImpOptimizer::ImpOptimizer( const Reference
XComponentContext rxContext, con
{
}
-//
-
+
ImpOptimizer::~ImpOptimizer()
{
}
-//
-
+
void ImpOptimizer::DispatchStatus()
{
@@ -521,7 +521,7 @@ void ImpOptimizer::DispatchStatus()
}
}
-//
-
+
sal_Bool ImpOptimizer::Optimize()
{
@@ -595,7 +595,7 @@ static void DispatchURL( Reference XComponentContext
xContext, OUString sURL,
}
}
-//
-
+
sal_Bool ImpOptimizer::Optimize( const Sequence PropertyValue rArguments )
{
diff --git a/sdext/source/minimizer/impoptimizer.hxx
b/sdext/source/minimizer/impoptimizer.hxx
index 5ad7ac8..ca0689f 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -30,9 +30,9 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/uno/XComponentContext.hpp
-// -
+
// - PDFExport -
-// -
+
class ImpOptimizer : public OptimizationStats
{
diff --git a/sdext/source/minimizer/informationdialog.hxx
b/sdext/source/minimizer/informationdialog.hxx
index d538c4e..cba2be5 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -38,9 +38,9 @@
#include com/sun/star/awt/PushButtonType.hpp
#include com/sun/star/io/XStream.hpp
-// -
+
// - InformationDialog -
-// -
+
class InformationDialog : public UnoDialog, public ConfigurationAccess
{
public :
diff --git a/sdext/source/minimizer/optimizerdialog.hxx
b/sdext/source/minimizer/optimizerdialog.hxx
index 7607e15..3ccce0b 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -54,9 +54,9 @@
#define PAGE_POS_Y 8
#define PAGE_WIDTH OD_DIALOG_WIDTH -
Re: Vertical text alignment for frames
Hi Regina, The new property specify whether the content of the frame positioned vertically at the top/center/bottom of the frame. Of course it doesn't have effect when there is no additional space. * A frame can contain nearly a whole document including headings, paragraph, tables, graphic, or sections. * The frame content is sensible to the compatibility settings regarding spacing. * Register true might be enabled. These things are true for table cells too, aren't they? * The content of a frame may float to a linked frame. Yeah, that's a special case, which I have to think of during implementation. * The height of a frame is often fitting to content. I don't know it is often or not, but I can imagine user cases when this alignment can be useful. The main thing is consistency. If we have the feature of vertical alignment for containers like text boxes and tables, then why don't we have it for frames too? Exists an attribute for this in ODF? Yes, it is called draw:textarea-vertical-align and is listed into style:graphic-properties which specifies formatting properties for chart, draw, graphic, and frame elements. Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc |6 +++--- scp2/source/ooo/module_pdfimport.scp |2 +- scp2/source/ooo/registryitem_ooo.scp |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 2434ea5930af9575e84353697d8a654b592098d7 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 20:04:54 2014 +0100 Remove visual noise from scp2 Change-Id: Id333de870389e8b4a074aa07fb2d0af336c5062a Reviewed-on: https://gerrit.libreoffice.org/8304 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6680cb5..8375644 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -274,7 +274,7 @@ End Name = name; \ End -// --- + #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ ParentID = modid; \ @@ -443,7 +443,7 @@ End REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ REGISTRY_ENTRY_KINDMAP(name, modid, key) \ -// --- + #ifdef _MSC_VER @@ -468,7 +468,7 @@ End #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty #endif -// --- + #if defined WNT #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index ee504fc..306ccc3 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -12,7 +12,7 @@ // --with-system-poppler builds it can be advantageous though to package this // module as an individual, optional part, so that the core installation does // not feature a dependency on a poppler package. -// + // The // /org.openoffice.TypeDetection.Types/Types/pdf_Portable_Document_Format // configuration node contained in pdfimport.xcd needs to override a diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 653b0a5..f5110ac 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -601,7 +601,7 @@ End // - Vista Default Programs // Find more information here: // URL: -// - + RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationDescription ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sccomp/source
sccomp/source/solver/solver.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2e9f7694b4c02e7dd592890d87b4710b45ce588b Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 20:04:28 2014 +0100 Remove visual noise from sccomp Change-Id: Ibf1d8ab8db874805a5cdab9a0cfa5bf84fb6b869 Reviewed-on: https://gerrit.libreoffice.org/8303 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index e5c1d0c..0dae2e9 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -413,9 +413,9 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) if ( !maStatus.isEmpty() ) return; -// + // build lp_solve model -// + lprec* lp = make_lp( 0, nVariables ); if ( !lp ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.hxx |2 -
scaddins/source/analysis/analysishelper.hxx | 18 ++---
scaddins/source/analysis/bessel.cxx | 18 ++---
scaddins/source/analysis/bessel.hxx |6 ++--
scaddins/source/analysis/financial.cxx |4 +-
scaddins/source/datefunc/datefunc.hxx | 32 +++
scaddins/source/pricing/black_scholes.cxx | 26 +--
scaddins/source/pricing/black_scholes.hxx |2 -
scaddins/source/pricing/pricing.cxx |2 -
scaddins/source/pricing/pricing.hxx | 38 ++--
10 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit ca884aab652b2eba6e05e7fae0f2d2d9a8dae5db
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:03:56 2014 +0100
Remove visual noise from scaddins
Change-Id: I533b172ae62b6a2056109c0e6cf854ec89de8391
Reviewed-on: https://gerrit.libreoffice.org/8302
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/scaddins/source/analysis/analysis.hxx
b/scaddins/source/analysis/analysis.hxx
index 0f781b3..7fa1ef3 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -234,7 +234,7 @@ public:
virtual double SAL_CALL getFvschedule( double fPrinc, const
css::uno::Sequence css::uno::Sequence double rSchedule ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException );
};
-//--
+
#endif
diff --git a/scaddins/source/analysis/analysishelper.hxx
b/scaddins/source/analysis/analysishelper.hxx
index f565820..bec214b 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -144,7 +144,7 @@ double GetCoupdays( sal_Int32 nNullDate,
sal_Int32 nSettle, sal_Int
-//-
+
@@ -254,7 +254,7 @@ public:
-//-
+
/// sorted list with unique sal_Int32 values
class SortedIndividualInt32List
@@ -300,7 +300,7 @@ public:
};
-//-
+
class ScaDoubleList
{
@@ -359,7 +359,7 @@ public:
};
-//-
+
/// stores double values 0.0, throws exception for double values 0.0, does
nothing for 0.0
class ScaDoubleListGT0 : public ScaDoubleList
@@ -370,7 +370,7 @@ public:
};
-//-
+
/// stores double values =0.0, throws exception for double values 0.0
class ScaDoubleListGE0 : public ScaDoubleList
@@ -381,7 +381,7 @@ public:
};
-//-
+
class Complex
{
@@ -744,7 +744,7 @@ inline ConvertDataLinear::ConvertDataLinear( const
sal_Char* p, double fC, doubl
-//-
+
/// Helper class for date calculation for various financial functions
class ScaDate
@@ -836,7 +836,7 @@ inline void ScaDate::addYears( sal_Int32 nYearCount )
throw( css::lang::IllegalA
}
-//-
+
/// Helper class for Any-double conversion, using current language settings
class ScaAnyConverter
@@ -924,7 +924,7 @@ public:
};
-//-
+
#endif
diff --git a/scaddins/source/analysis/bessel.cxx
b/scaddins/source/analysis/bessel.cxx
index 9aa720e..3e1ac27 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -28,16 +28,16 @@ using ::com::sun::star::sheet::NoConvergenceException;
namespace sca {
namespace analysis {
-//
+
const double f_PI = 3.1415926535897932385;
const double f_PI_DIV_2 = f_PI / 2.0;
const double f_PI_DIV_4 = f_PI / 4.0;
const double f_2_DIV_PI = 2.0 / f_PI;
-//
+
// BESSEL J
-//
+
/* The BESSEL function, first kind, unmodified:
The algorithm follows
@@ -158,9 +158,9 @@ double BesselJ( double x, sal_Int32 N ) throw
(IllegalArgumentException, NoConve
throw NoConvergenceException(); // unlikely to happen
}
-//
+
// BESSEL I
-//
+
/* The BESSEL function, first kind, modified:
@@ -229,7 +229,7
[Libreoffice-commits] core.git: 2 commits - nlpsolver/src rsc/inc
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java |2 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/ResourceManager.java |2 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/SCOSolverImpl.java |2 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java | 26 +++ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/DummyEvolutionarySolverStatusDialog.java | 12 +-- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java |6 - nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java | 32 - nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button.java |8 +- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label.java |4 - nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/LabeledControl.java |8 +- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/TextAlign.java |6 - rsc/inc/rscerror.h | 34 +- 12 files changed, 71 insertions(+), 71 deletions(-) New commits: commit f7857265f2b36a884b189e43f514026a34b5a882 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 19:50:41 2014 +0100 Remove visual noise from rsc Change-Id: Idc310247ae677687fbfb2912d9e4a0f5e5880190 Reviewed-on: https://gerrit.libreoffice.org/8296 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 6c7fd6e..418cb85 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -28,9 +28,9 @@ #define ERR_OPENFILE0x0102 // Return #define ERR_NOCHAR 0x0103 // Return #define ERR_NORSCINST 0x0104 // Return -#define ERR_USAGE 0x0105 // +#define ERR_USAGE 0x0105 #define ERR_NOINPUT 0x0106 // Return -#define ERR_UNKNOWNSW 0x0107 // +#define ERR_UNKNOWNSW 0x0107 #define ERR_REFTODEEP 0x0108 // Return #define ERR_FILEFORMAT 0x0109 // Return #define ERR_FILESIZE0x010A // Return @@ -52,22 +52,22 @@ #define ERR_RSCINST_RESERVEDNAME (ERR_RSCINST +2 ) // Return #define ERR_LEX 0x0270 -#define ERR_YACC0x0280 // -#define ERR_DOUBLEID(ERR_YACC+1 ) // -#define ERR_FALSETYPE (ERR_YACC+2 ) // -#define ERR_NOVARIABLENAME (ERR_YACC+3 ) // -#define ERR_USHORTRANGE (ERR_YACC+4 ) // -#define ERR_IDRANGE (ERR_YACC+5 ) // -#define ERR_NOCOPYOBJ (ERR_YACC+6 ) // +#define ERR_YACC0x0280 +#define ERR_DOUBLEID(ERR_YACC+1 ) +#define ERR_FALSETYPE (ERR_YACC+2 ) +#define ERR_NOVARIABLENAME (ERR_YACC+3 ) +#define ERR_USHORTRANGE (ERR_YACC+4 ) +#define ERR_IDRANGE (ERR_YACC+5 ) +#define ERR_NOCOPYOBJ (ERR_YACC+6 ) #define ERR_REFNOTALLOWED (ERR_YACC+7 ) // Return -#define ERR_DOUBLEDEFINE(ERR_YACC+8 ) // -#define ERR_COPYNOTALLOWED (ERR_YACC+9 ) // -#define ERR_IDEXPECTED (ERR_YACC+10) // -#define ERR_ZERODIVISION(ERR_YACC+11) // -#define ERR_PRAGMA (ERR_YACC+12) // -#define ERR_DECLAREDEFINE (ERR_YACC+13) // -#define ERR_NOTUPELNAME (ERR_YACC+14) // -#define ERR_NOTYPE (ERR_YACC+15) // +#define ERR_DOUBLEDEFINE(ERR_YACC+8 ) +#define ERR_COPYNOTALLOWED (ERR_YACC+9 ) +#define ERR_IDEXPECTED (ERR_YACC+10) +#define ERR_ZERODIVISION(ERR_YACC+11) +#define ERR_PRAGMA (ERR_YACC+12) +#define ERR_DECLAREDEFINE (ERR_YACC+13) +#define ERR_NOTUPELNAME (ERR_YACC+14) +#define ERR_NOTYPE (ERR_YACC+15) #define ERR_RSCARRAY 0x02A0 // Return #define ERR_ARRAY_INVALIDINDEX (ERR_RSCARRAY +1 ) // Return commit fed2f0698c4e108c2ad65ec5a6ae8c6211c14326 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 19:20:44 2014 +0100 Remove trailing whitespace from nlpsolver Change-Id: I8ee2aff2c18adaf5582ed6eeb174e88313d8c8a2 Reviewed-on: https://gerrit.libreoffice.org/8283 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java index 77be94d..e51f2e6 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java +++
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hbox.cxx |2 +-
hwpfilter/source/hwpfile.h |4 ++--
hwpfilter/source/hwpreader.cxx | 18 +-
hwpfilter/source/list.hxx |6 +++---
hwpfilter/source/mzstring.cxx |2 +-
hwpfilter/source/mzstring.h|4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 294229eb422f093f4d1cd30da21783957c72165d
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:56:33 2014 +0100
Remove visual noise from hwpfilter
Change-Id: I57ea366a5ba585374773f53ca6cee99085fd846a
Reviewed-on: https://gerrit.libreoffice.org/8267
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index c3b9d60..20edf6a 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -490,7 +490,7 @@ static const hchar *GetOutlineStyleChars(int style)
{ // 3
0x2f18, 0x2f16, 0x2f12, 0x2f10, 0x2f06, 0x2f00, 0x2043, 0x
},
-{ //
+{
0xAC61, 0xB677, 0xB861, 0xB8F7, 0xB781, 0x
},
};
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index d6f9738..a404bf4 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//
+
// hwpfile.h
// (C) 1998 Mizi Research, All rights are reserved
-//
+
#ifndef _HWPFILE_H_
#define _HWPFILE_H_
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 3a751cf..7b6d698 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1097,7 +1097,7 @@ void HwpReader::makeMasterStyles()
continue;
}
-// - header - //
+// - header -
if( pPage-header )
{
rstartEl(ascii(style:header), rList);
@@ -1197,7 +1197,7 @@ void HwpReader::makeMasterStyles()
rendEl(ascii(text:p));
rendEl(ascii(style:header));
}
-// - footer - //
+// - footer -
if( pPage-footer )
{
rstartEl(ascii(style:footer), rList);
@@ -1851,7 +1851,7 @@ void HwpReader::makeTStyle(CharShape * cshape)
void HwpReader::makeTableStyle(Table *tbl)
{
-// --- table //
+// --- table
TxtBox *hbox = tbl-box;
padd(ascii(style:name), sXML_CDATA,
@@ -1868,7 +1868,7 @@ void HwpReader::makeTableStyle(Table *tbl)
rendEl(ascii(style:properties));
rendEl(ascii(style:style));
-// --- column //
+// --- column
for (size_t i = 0 ; i tbl-columns.nCount -1 ; i++)
{
sprintf(buf,Table%d.%c,hbox-style.boxnum, static_castchar('A'+i));
@@ -1884,7 +1884,7 @@ void HwpReader::makeTableStyle(Table *tbl)
rendEl(ascii(style:style));
}
-// --- row //
+// --- row
for (size_t i = 0 ; i tbl-rows.nCount -1 ; i++)
{
sprintf(buf,Table%d.row% SAL_PRI_SIZET u,hbox-style.boxnum, i +
1);
@@ -1900,7 +1900,7 @@ void HwpReader::makeTableStyle(Table *tbl)
rendEl(ascii(style:style));
}
-// --- cell - //
+// --- cell -
for (std::listTCell*::iterator it = tbl-cells.begin(), aEnd =
tbl-cells.end(); it != aEnd; ++it)
{
TCell *tcell = *it;
@@ -3432,7 +3432,7 @@ void HwpReader::makeTable(TxtBox * hbox)
pList-clear();
Table *tbl = hbox-m_pTable;
-// --- column //
+// --- column
for (size_t i = 0 ; i tbl-columns.nCount -1 ; i++)
{
sprintf(buf,Table%d.%c,hbox-style.boxnum, static_castchar('A'+i));
@@ -3442,7 +3442,7 @@ void HwpReader::makeTable(TxtBox * hbox)
rendEl(ascii(table:table-column));
}
-// --- cell //
+// --- cell
int j = -1, k = -1;
for (std::listTCell*::iterator it = tbl-cells.begin(), aEnd =
tbl-cells.end(); it != aEnd; ++it)
{
@@ -3454,7 +3454,7 @@ void HwpReader::makeTable(TxtBox * hbox)
rendEl(ascii(table:table-row));
k = j;
}
-// --- row //
+// --- row
sprintf(buf,Table%d.row%d,hbox-style.boxnum, tcell-nRowIndex +
1);
padd(ascii(table:style-name), sXML_CDATA, ascii( buf ));
rstartEl(ascii(table:table-row), rList);
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index 55a0d96..c2b820f 100644
--- a/hwpfilter/source/list.hxx
+++
[Libreoffice-commits] core.git: helpcompiler/source
helpcompiler/source/BasCodeTagger.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a78aa2038d08bea6b24c1ff8d31d202dd4f76d6f Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 18:55:38 2014 +0100 Remove visual noise from helpcompiler Change-Id: Ied20352592de019c3b4735af8cc63947cd7d61a2 Reviewed-on: https://gerrit.libreoffice.org/8266 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx index fcbe8e4..c1a94cf 100644 --- a/helpcompiler/source/BasCodeTagger.cxx +++ b/helpcompiler/source/BasCodeTagger.cxx @@ -53,7 +53,7 @@ xmlNodePtr LibXmlTreeWalker::currentNode() return m_pCurrentNode; } -//== + BasicCodeTagger::BasicCodeTagger( xmlDocPtr rootDoc ): m_Highlighter(HIGHLIGHT_BASIC) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |4 ++--
jvmfwk/source/elements.cxx |8
jvmfwk/source/libxmlutil.cxx |6 +++---
jvmfwk/source/libxmlutil.hxx |6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 132d7941e01a6b385f17ebd768341debd49f8847
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:15:10 2014 +0100
Remove visual noise from jvmfwk
Change-Id: Ie9ad9478532b395bd6a2bddd54bbe0d10b1b5eb2
Reviewed-on: https://gerrit.libreoffice.org/8277
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 6fa931d..9fc8e83 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -39,7 +39,7 @@ rtl::ReferenceVendorBase createInstance(createInstance_func
pFunc,
-//##
+
MalformedVersionException::MalformedVersionException()
{}
@@ -54,7 +54,7 @@ MalformedVersionException::operator =(
{
return *this;
}
-//##
+
VendorBase::VendorBase(): m_bAccessibility(false)
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index ec30fc2..6b6ec8b 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -168,7 +168,7 @@ void createSettingsStructure(xmlDoc * document, bool *
bNeedsSave)
}
-//
+
VersionInfo::VersionInfo(): arVersions(NULL)
{
}
@@ -204,7 +204,7 @@ sal_Int32 VersionInfo::getExcludeVersionSize()
{
return vecExcludeVersions.size();
}
-//==
+
NodeJava::NodeJava(Layer layer):
m_layer(layer)
@@ -797,7 +797,7 @@ bool NodeJava::createSettingsDocument() const
return true;
}
-//=
+
CNodeJavaInfo::CNodeJavaInfo() :
m_bEmptyNode(false), bNil(true), bAutoSelect(true),
nFeatures(0), nRequirements(0)
@@ -1048,7 +1048,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
return pInfo;
}
-//
+
MergedSettings::MergedSettings():
m_bEnabled(false),
m_sClassPath(),
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 30b1d07..bb2640e 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -53,7 +53,7 @@ CXPathObjectPtr::operator xmlXPathObject*() const
{
return _object;
}
-//===
+
CXPathContextPtr::CXPathContextPtr(xmlXPathContextPtr aContext)
: _object(aContext)
{
@@ -85,7 +85,7 @@ CXPathContextPtr::operator xmlXPathContext*() const
{
return _object;
}
-//===
+
CXmlDocPtr::CXmlDocPtr(xmlDoc* aDoc)
: _object(aDoc)
{
@@ -118,7 +118,7 @@ CXmlDocPtr::operator xmlDoc*() const
return _object;
}
-//===
+
CXmlCharPtr::CXmlCharPtr(xmlChar * aChar)
: _object(aChar)
{
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 4ee92d1..b99c04f 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -43,7 +43,7 @@ public:
operator xmlXPathObject* () const;
};
-//===
+
class CXPathContextPtr
{
xmlXPathContext* _object;
@@ -59,7 +59,7 @@ public:
operator xmlXPathContext* () const;
};
-//===
+
class CXmlDocPtr
{
xmlDoc* _object;
@@ -78,7 +78,7 @@ public:
operator xmlDoc* () const;
};
-//===
+
class CXmlCharPtr
{
xmlChar* _object;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/qa package/source
package/qa/ofopxmlstorages/Test01.java |4 -
package/qa/ofopxmlstorages/Test02.java |4 -
package/qa/ofopxmlstorages/Test03.java |4 -
package/qa/ofopxmlstorages/Test04.java |4 -
package/qa/ofopxmlstorages/Test05.java |4 -
package/qa/ofopxmlstorages/Test07.java | 12 ++---
package/qa/ofopxmlstorages/Test08.java | 12 ++---
package/qa/storages/BorderedStream.java | 48 +++
package/qa/storages/RegressionTest_114358.java |8 +--
package/qa/storages/RegressionTest_i26398.java |8 +--
package/qa/storages/RegressionTest_i27773.java | 12 ++---
package/qa/storages/RegressionTest_i29169.java | 24 +--
package/qa/storages/RegressionTest_i29321.java |8 +--
package/qa/storages/RegressionTest_i30400.java | 36 -
package/qa/storages/RegressionTest_i30677.java | 24 +--
package/qa/storages/RegressionTest_i35095.java |4 -
package/qa/storages/RegressionTest_i46848.java |8 +--
package/qa/storages/RegressionTest_i49755.java |8 +--
package/qa/storages/RegressionTest_i55821.java |8 +--
package/qa/storages/RegressionTest_i59886.java |8 +--
package/qa/storages/RegressionTest_i61909.java |8 +--
package/qa/storages/RegressionTest_i84234.java |8 +--
package/qa/storages/Test01.java |4 -
package/qa/storages/Test02.java |4 -
package/qa/storages/Test03.java |4 -
package/qa/storages/Test04.java |4 -
package/qa/storages/Test05.java |4 -
package/qa/storages/Test07.java |4 -
package/qa/storages/Test08.java |4 -
package/qa/storages/Test09.java |4 -
package/qa/storages/Test10.java | 12 ++---
package/qa/storages/Test11.java | 12 ++---
package/qa/storages/Test12.java | 12 ++---
package/qa/storages/Test13.java |8 +--
package/qa/storages/Test14.java |8 +--
package/qa/storages/Test15.java |8 +--
package/qa/storages/Test16.java |4 -
package/qa/storages/Test17.java |4 -
package/qa/storages/Test18.java |4 -
package/source/xstor/switchpersistencestream.hxx |2
package/source/xstor/xstorage.cxx|2
41 files changed, 186 insertions(+), 186 deletions(-)
New commits:
commit d148739576fbb555099b51df39b51678f573a8a5
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:38:36 2014 +0100
Remove visual noise from package
Change-Id: Icef40ad2d451d3c5ca90ed4b305ece5430d352f7
Reviewed-on: https://gerrit.libreoffice.org/8289
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/package/qa/ofopxmlstorages/Test01.java
b/package/qa/ofopxmlstorages/Test01.java
index b317051..f27f34e 100644
--- a/package/qa/ofopxmlstorages/Test01.java
+++ b/package/qa/ofopxmlstorages/Test01.java
@@ -151,9 +151,9 @@ public class Test01 implements StorageTest {
if ( !m_aTestHelper.disposeStorage( xTempStorage ) ||
!m_aTestHelper.disposeStorage( xTempFileStorage ) )
return false;
-//
+
// now check all the written and copied information
-//
+
// the temporary file must not be locked any more after storage
disposing
XStorage xResultStorage = m_aTestHelper.createStorageFromURL(
m_xStorageFactory,
diff --git a/package/qa/ofopxmlstorages/Test02.java
b/package/qa/ofopxmlstorages/Test02.java
index 1da5855..a39e78c 100644
--- a/package/qa/ofopxmlstorages/Test02.java
+++ b/package/qa/ofopxmlstorages/Test02.java
@@ -125,9 +125,9 @@ public class Test02 implements StorageTest {
return false;
-//
+
// now check all the written information
-//
+
// close the output part of the temporary stream
// the output part must present since we already wrote to the
stream
diff --git a/package/qa/ofopxmlstorages/Test03.java
b/package/qa/ofopxmlstorages/Test03.java
index 1aef721..703e420 100644
--- a/package/qa/ofopxmlstorages/Test03.java
+++ b/package/qa/ofopxmlstorages/Test03.java
@@ -115,9 +115,9 @@ public class Test03 implements StorageTest {
if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
return false;
-//
+
// check storage hyerarchy tree
-//
[Libreoffice-commits] core.git: 2 commits - linguistic/source writerfilter/source
linguistic/source/dicimp.cxx |4 ++--
linguistic/source/lngsvcmgr.cxx | 12 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 -
4 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 613d53637eb6d84d48b379efacc469659634d669
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:17:44 2014 +0100
Remove visual noise from linguistic
Change-Id: I9ed8b9cf844d9e5909cc87dac1438ec7a54613b8
Reviewed-on: https://gerrit.libreoffice.org/8280
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 0afa14d..0ce35b5 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -456,9 +456,9 @@ sal_uLong DictionaryNeo::saveEntries(const OUString rURL)
sal_uLong nErr = sal::static_int_cast sal_uLong (-1);
SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream(
xStream ) );
-//
+
// Always write as the latest version, i.e. DIC_VERSION_7
-//
+
rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8;
pStream-WriteLine(OString(pVerOOo7));
if (0 != (nErr = pStream-GetError()))
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 104a4a0..6b15796 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -735,9 +735,9 @@ void LngSvcMgr::UpdateAll()
OUString aLastFoundList( OUString::createFromAscii(
apLastFoundLists[k] ) );
sal_Int32 i;
-//
+
// remove configured but not available language/services entries
-//
+
Sequence OUString aNodeNames( aCfg.GetNodeNames( aActiveList ) );
// list of configured locales
sal_Int32 nNodeNames = aNodeNames.getLength();
const OUString *pNodeName = aNodeNames.getConstArray();
@@ -752,11 +752,11 @@ void LngSvcMgr::UpdateAll()
aCurSvcs[k][ pNodeName[i] ] = aCfgSvcs;
}
-//
+
// add new available language/service entries
// and
// set last found services to currently available ones
-//
+
Sequence Locale aAvailLocales( getAvailableLocales(aService) );
sal_Int32 nAvailLocales = aAvailLocales.getLength();
const Locale *pAvailLocale = aAvailLocales.getConstArray();
@@ -782,9 +782,9 @@ void LngSvcMgr::UpdateAll()
}
}
-//
+
// write new data back to configuration
-//
+
for (int k = 0; k nNumServices; ++k)
{
for (int i = 0; i 2; ++i)
commit cd35fd41df314d0176ae1da4a67e6a7d978f3cf2
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 26 16:14:26 2014 +0100
-Werror,-Wunused-private-field
Change-Id: Ie64ffd691f3528136414bfc67f89881f3c778f1f
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f86fbd5..bf6155b9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -175,7 +175,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_aAnnotationPositions(),
m_xInsertTextRange(xInsertTextRange),
m_bIsNewDoc(bIsNewDoc),
-m_bBibliographyMarkerAdded(false),
m_bInTableStyleRunProps(false),
m_pSdtHelper(0),
m_nTableDepth(0),
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b53cd34..d1e9bb4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -403,7 +403,6 @@ public:
::com::sun::star::uno::Reference ::com::sun::star::text::XTextRange
m_xInsertTextRange;
private:
bool m_bIsNewDoc;
-bool m_bBibliographyMarkerAdded;
public:
DomainMapper_Impl(
DomainMapper rDMapper,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportbuilder/java
reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
|4 +--
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
| 10 -
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
| 11 --
3 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit bc1b0fca47dff0b6301988b831147ac89a0de375
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:48:56 2014 +0100
Remove visual noise from reportbuilder
Change-Id: I4063ea1ea95ddd1a3c220ca0da89cdcd78f62410
Reviewed-on: https://gerrit.libreoffice.org/8294
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index 7b0a281..f8ad55f 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -219,7 +219,7 @@ public class ChartRawReportTarget extends
OfficeDocumentReportTarget
}
// All styles have to be processed or you will loose the
paragraph-styles and inline text-styles.
-// ..
+
performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs);
@@ -227,7 +227,7 @@ public class ChartRawReportTarget extends
OfficeDocumentReportTarget
xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN);
++closeTags;
}
-//
/
+
public void processText(final String text) throws DataSourceException,
ReportProcessingException
{
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index d8f7cd8..a6bf1e8 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -455,7 +455,7 @@ public class SpreadsheetRawReportTarget extends
OfficeDocumentReportTarget
// // System.out.print(cbs[i].getBoundary() + );
// // }
// // System.out.println();
-//
+
// LOGGER.error(A cell cannot span less than the declared
columns: Declared= + initialColumnSpan + Computed=
// + span);
// }
@@ -471,7 +471,7 @@ public class SpreadsheetRawReportTarget extends
OfficeDocumentReportTarget
}
// All styles have to be processed or you will loose the
paragraph-styles and inline text-styles.
-// ..
+
performStyleProcessing(attrs);
final AttributeList attrList = buildAttributeList(attrs);
@@ -557,7 +557,7 @@ public class SpreadsheetRawReportTarget extends
OfficeDocumentReportTarget
// at this point we need to generate the table-columns section
based on our boundary table
// table:shapes
// draw:frame /
-// ..
+
// /table:shapes
xmlWriter.writeTag(OfficeNamespaces.TABLE_NS,
OfficeToken.SHAPES, null, XmlWriterSupport.OPEN);
@@ -589,7 +589,7 @@ public class SpreadsheetRawReportTarget extends
OfficeDocumentReportTarget
// at this point we need to generate the table-columns section
based on our boundary table
// table-columns
// table-column style-name=coX/
-// ..
+
// /table-columns
// the first boundary is '0' which is a placeholder so we will
ignore it
xmlWriter.writeTag(OfficeNamespaces.TABLE_NS,
OfficeToken.TABLE_COLUMNS, null, XmlWriterSupport.OPEN);
@@ -710,7 +710,7 @@ public class SpreadsheetRawReportTarget extends
OfficeDocumentReportTarget
return raw/ + PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET;
}
-//
/
+
public void processText(final String text) throws DataSourceException,
ReportProcessingException
{
if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index f34b54e..b24b2cf 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++
[Libreoffice-commits] core.git: shell/source
shell/source/backends/kde4be/kde4backend.cxx |2 +-
shell/source/backends/kdebe/kdebackend.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e44a7eefb7f632977b4c8c91ad14244372c6e04d
Author: Maxim Monastirsky momonas...@gmail.com
Date: Wed Feb 26 17:02:38 2014 +0200
KDE: don't throw on TemplatePathVariable
This is required after commit
838b77f5f3d6d8fd98891e99a23ff78a6a357cb2.
Actual functionality is still missing.
Change-Id: Ib94d8a982609de730d9c61bf7bf9886093c51f5b
Reviewed-on: https://gerrit.libreoffice.org/8367
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/shell/source/backends/kde4be/kde4backend.cxx
b/shell/source/backends/kde4be/kde4backend.cxx
index bf12683..1d486e4 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -172,7 +172,7 @@ css::uno::Any Service::getPropertyValue(OUString const
PropertyName)
|| PropertyName == SourceViewFontName || PropertyName ==
WorkPathVariable || PropertyName == ooInetFTPProxyName
|| PropertyName == ooInetFTPProxyPort || PropertyName ==
ooInetHTTPProxyName || PropertyName == ooInetHTTPProxyPort
|| PropertyName == ooInetHTTPSProxyName || PropertyName ==
ooInetHTTPSProxyPort || PropertyName == ooInetNoProxy
- || PropertyName == ooInetProxyType )
+ || PropertyName == ooInetProxyType || PropertyName ==
TemplatePathVariable )
{
return css::uno::makeAny(
enabled_
diff --git a/shell/source/backends/kdebe/kdebackend.cxx
b/shell/source/backends/kdebe/kdebackend.cxx
index 8089632..08915e8 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -172,7 +172,7 @@ css::uno::Any Service::getPropertyValue(OUString const
PropertyName)
|| PropertyName == SourceViewFontName || PropertyName ==
WorkPathVariable || PropertyName == ooInetFTPProxyName
|| PropertyName == ooInetFTPProxyPort || PropertyName ==
ooInetHTTPProxyName || PropertyName == ooInetHTTPProxyPort
|| PropertyName == ooInetHTTPSProxyName || PropertyName ==
ooInetHTTPSProxyPort || PropertyName == ooInetNoProxy
- || PropertyName == ooInetProxyType )
+ || PropertyName == ooInetProxyType || PropertyName ==
TemplatePathVariable )
{
return css::uno::makeAny(
enabled_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - vcl/coretext
vcl/coretext/ctlayout.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit ac7062d7fb6e5dfe0f81d53daec7f088dc4f9e3d
Author: Herbert Dürr h...@apache.org
Date: Thu Feb 20 13:52:52 2014 +
fdo#64957: #i124233# prevent the accumulation of rounding errors
in CTLayout::FillDXArry()
Change-Id: Ifb4f16fb76f67d5b5c96fdb0545c64eb8316aa3c
Reviewed-on: https://gerrit.libreoffice.org/8359
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/8366
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 0e9a6e0..d248c48 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -369,9 +369,8 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
long nPixWidth = GetTextWidth();
if( pDXArray ) {
-// initialize the result array
-for( int i = 0; i mnCharCount; ++i)
-pDXArray[i] = 0;
+// prepare the sub-pixel accurate logical-width array
+::std::vectorfloat aWidthVector( mnCharCount );
// handle each glyph run
CFArrayRef aGlyphRuns = CTLineGetGlyphRuns( mpCTLine );
const int nRunCount = CFArrayGetCount( aGlyphRuns );
@@ -389,9 +388,18 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
CTRunGetStringIndices( pGlyphRun, aFullRange, aIndexVec[0] );
for( int i = 0; i != nGlyphCount; ++i ) {
const int nRelIdx = aIndexVec[i];
-pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width);
+aWidthVector[nRelIdx] += aSizeVec[i].width;
}
}
+
+// convert the sub-pixel accurate array into classic pDXArray integers
+float fWidthSum = 0.0;
+sal_Int32 nOldDX = 0;
+for( int i = 0; i mnCharCount; ++i) {
+const sal_Int32 nNewDX = rint( fWidthSum += aWidthVector[i]);
+pDXArray[i] = nNewDX - nOldDX;
+nOldDX = nNewDX;
+}
}
return nPixWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: salhelper/source
salhelper/source/timer.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 6a8f848edecd1403686b4ad1232362908b1e2dbf
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:53:09 2014 +0100
Remove visual noise from salhelper
Change-Id: Id01f525478558f2d280bfda7c970f4e16faaff44
Reviewed-on: https://gerrit.libreoffice.org/8298
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx
index 164a5a8..d46c660 100644
--- a/salhelper/source/timer.cxx
+++ b/salhelper/source/timer.cxx
@@ -32,10 +32,10 @@ class salhelper::TimerManager : public osl::Thread
public:
-///
+
TimerManager();
-///
+
~TimerManager();
/// register timer
@@ -74,10 +74,10 @@ protected:
};
-/
-//
+
+
// Timer class
-//
+
Timer::Timer()
: m_aTimeOut( 0 ),
@@ -232,10 +232,10 @@ TTimeValue Timer::getRemainingTime() const
}
-/
-//
+
+
// Timer manager
-//
+
namespace
{
// Synchronize access to TimerManager
@@ -461,10 +461,10 @@ void TimerManager::run()
}
-/
-//
+
+
// Timer manager cleanup
-//
+
// jbu:
// The timer manager cleanup has been removed (no thread is killed anymore).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno_impl.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3a35e28628a6d9fd9100e35754eaba1db9bf1d50
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:39:53 2014 +0100
Remove visual noise from pyuno
Change-Id: I27f5edf45d5968879436e2466f953576651ed8ae
Reviewed-on: https://gerrit.libreoffice.org/8290
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index 805466f..ae0f85f 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -131,9 +131,9 @@ inline PyObject* PyStrBytes_FromStringAndSize(const char
*string, Py_ssize_t len
namespace pyuno
{
-//--
+
// Logging API - implementation can be found in pyuno_util
-//--
+
struct RuntimeCargo;
namespace LogLevel
{
@@ -159,7 +159,7 @@ void logException( RuntimeCargo *cargo, const char *intro,
static const sal_Int32 VAL2STR_MODE_DEEP = 0;
static const sal_Int32 VAL2STR_MODE_SHALLOW = 1;
OUString val2str( const void * pVal, typelib_TypeDescriptionReference *
pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW(());
-//--
+
typedef ::boost::unordered_map
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 453 ---
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 454
2 files changed, 454 insertions(+), 453 deletions(-)
New commits:
commit 8520f61fe3def2c3f61fb7ce65c13d2b5076304a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Feb 26 16:05:24 2014 +0100
CppunitTest_sw_ooxmlsdrexport: move all AlternateContent tests
AlternateContent is used while dealing with shapes, move all those
tests. With this, the original suite has 330 asserts, the new one has
78, and they can run in parallel since
2efee3c632bb8372685bb9f7b07e99b91668d779.
Toplevel 'make' on my machine:
- before: 3m15.237s
- after: 2m40.197s
Change-Id: Id7ac9708e29ae8c6ea7db8aa845de089ed4bdf42
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e144193..10fec59 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1013,24 +1013,6 @@ DECLARE_OOXMLEXPORT_TEST(testTableFloating,
table-floating.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getPropertysal_Int32(xFrame,
RightMargin));
}
-DECLARE_OOXMLEXPORT_TEST(testTableFloatingMargins,
table-floating-margins.docx)
-{
-// In case the table had custom left cell margin, the horizontal position
was still incorrect (too small, -199).
-uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
-uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(-499), getPropertysal_Int32(xFrame,
HoriOrientPosition));
-// These were 0 as well, due to lack of import.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), getPropertysal_Int32(xFrame,
TopMargin));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), getPropertysal_Int32(xFrame,
BottomMargin));
-
-// Paragraph bottom margin wasn't 0 in the A1 cell of the floating table.
-xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
-assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:textbox/w:txbxContent/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing,
after, 0);
-}
-
DECLARE_OOXMLEXPORT_TEST(testFdo44689_start_page_0,
fdo44689_start_page_0.docx)
{
// The problem was that the import export process did not analyze the
'start from page' attribute of a section
@@ -1451,22 +1433,6 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, smartart.docx)
CPPUNIT_ASSERT_EQUAL(OUString(RenderedShapes), nValue); // Rendered
bitmap has the proper name
}
-DECLARE_OOXMLEXPORT_TEST(testFdo69636, fdo69636.docx)
-{
-/*
- * The problem was that the exporter didn't mirror the workaround of the
- * importer, regarding the btLr text frame direction: the
- * mso-layout-flow-alt property was completely missing in the output.
- */
-xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
-// VML
-CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:textbox,
style).match(mso-layout-flow-alt:bottom-to-top));
-// drawingML
-assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:bodyPr,
vert, vert270);
-}
-
DECLARE_OOXMLEXPORT_TEST(testCharHighlight, char_highlight.docx)
{
const uno::Reference text::XTextRange xPara = getParagraph(1);
@@ -1659,26 +1625,6 @@ DECLARE_OOXMLEXPORT_TEST(testPgMargin,
testPgMargin.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:sectPr/w:pgMar, left,
1440);
}
-DECLARE_OOXMLEXPORT_TEST(testVMLData, TestVMLData.docx)
-{
-// The problem was exporter was exporting vml data for shape in w:rPr
element.
-// vml data shoud not come under w:rPr element.
-xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
-if (!pXmlDoc)
-return;
-CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect,
stroked).match(f));
-}
-
-DECLARE_OOXMLEXPORT_TEST(testImageData, image_data.docx)
-{
-// The problem was exporter was exporting v:imagedata data for shape in
w:pict as v:fill w element.
-
-xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
-if (!pXmlDoc)
-return;
-CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:imagedata,
detectmouseclick).match(t));
-}
-
DECLARE_OOXMLEXPORT_TEST(testImageCrop, ImageCrop.docx)
{
uno::Referencedrawing::XShape image = getShape(1);
@@ -1695,65 +1641,6 @@ DECLARE_OOXMLEXPORT_TEST(testImageCrop, ImageCrop.docx)
CPPUNIT_ASSERT_EQUAL( sal_Int32( 2290 ), aGraphicCropStruct.Bottom );
}
-DECLARE_OOXMLEXPORT_TEST(testFdo70838, fdo70838.docx)
-{
-// The problem
[Libreoffice-commits] core.git: i18npool/inc i18npool/source
i18npool/inc/breakiteratorImpl.hxx|4 +-
i18npool/inc/breakiterator_cjk.hxx|4 +-
i18npool/inc/breakiterator_ctl.hxx|4 +-
i18npool/inc/breakiterator_th.hxx |4 +-
i18npool/inc/breakiterator_unicode.hxx|4 +-
i18npool/inc/calendarImpl.hxx |4 +-
i18npool/inc/calendar_gregorian.hxx | 20
+-
i18npool/inc/calendar_hijri.hxx |4 +-
i18npool/inc/calendar_jewish.hxx |4 +-
i18npool/inc/indexentrysupplier.hxx |4 +-
i18npool/inc/indexentrysupplier_asian.hxx |4 +-
i18npool/inc/indexentrysupplier_common.hxx|4 +-
i18npool/inc/indexentrysupplier_default.hxx |4 +-
i18npool/inc/indexentrysupplier_ja_phonetic.hxx |4 +-
i18npool/inc/inputsequencechecker.hxx |4 +-
i18npool/inc/inputsequencechecker_hi.hxx |4 +-
i18npool/inc/inputsequencechecker_th.hxx |4 +-
i18npool/inc/localedata.hxx |4 +-
i18npool/inc/textconversion.hxx | 12
+++---
i18npool/inc/textconversionImpl.hxx |4 +-
i18npool/inc/unoscripttypedetector.hxx|4 +-
i18npool/source/breakiterator/breakiteratorImpl.cxx |4 +-
i18npool/source/breakiterator/breakiterator_th.cxx|2 -
i18npool/source/breakiterator/xdictionary.cxx |8
++--
i18npool/source/calendar/calendar_gregorian.cxx |2 -
i18npool/source/calendar/calendar_hijri.cxx |6
+--
i18npool/source/characterclassification/cclass_unicode.cxx|2 -
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |2 -
i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx |2 -
i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx |2 -
i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx |2 -
i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx|2 -
i18npool/source/transliteration/transliterationImpl.cxx |2 -
33 files changed, 72 insertions(+), 72 deletions(-)
New commits:
commit 2a42d5ec2965451f8cb2e719d831f4b2722f51bb
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:57:53 2014 +0100
Remove visual noise from i18npool
Change-Id: I1cd4254713ce9c1bc7c232414c24e926f1f8a653
Reviewed-on: https://gerrit.libreoffice.org/8269
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/i18npool/inc/breakiteratorImpl.hxx
b/i18npool/inc/breakiteratorImpl.hxx
index 92cae01..a6d3e65 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -36,9 +36,9 @@
namespace com { namespace sun { namespace star { namespace i18n {
-//
+
// class BreakIterator
-//
+
class BreakIteratorImpl : public cppu::WeakImplHelper2
XBreakIterator,
diff --git a/i18npool/inc/breakiterator_cjk.hxx
b/i18npool/inc/breakiterator_cjk.hxx
index 1f16326..5985c39 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -23,9 +23,9 @@
#include xdictionary.hxx
namespace com { namespace sun { namespace star { namespace i18n {
-//
+
// class BreakIterator_CJK
-//
+
class BreakIterator_CJK : public BreakIterator_Unicode
{
public:
diff --git a/i18npool/inc/breakiterator_ctl.hxx
b/i18npool/inc/breakiterator_ctl.hxx
index 270f64b..fce4a35 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -24,9 +24,9 @@
namespace com { namespace sun { namespace star { namespace i18n {
-//
+
// class BreakIterator_CTL
-//
+
class BreakIterator_CTL : public BreakIterator_Unicode
{
public:
diff --git a/i18npool/inc/breakiterator_th.hxx
b/i18npool/inc/breakiterator_th.hxx
index 19dbeae..8c8abb4 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -22,9 +22,9 @@
namespace com { namespace sun { namespace star { namespace i18n {
-//
[Libreoffice-commits] core.git: io/source io/test
io/source/TextInputStream/TextInputStream.cxx |8
io/source/TextOutputStream/TextOutputStream.cxx |8
io/source/stm/omark.cxx |4 ++--
io/test/testcomponent.cxx |3 +--
4 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 043e378521faecfcc09e0d7007de93882c50c461
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:07:42 2014 +0100
Remove visual noise from io
Change-Id: I46f8c4f793596b0e6feb2db7b9302b9b6eb9644b
Reviewed-on: https://gerrit.libreoffice.org/8273
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index 07379af..d6df3a2 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::registry;
namespace io_TextInputStream
{
-//===
+
// Implementation XTextInputStream
typedef WeakImplHelper2 XTextInputStream2, XServiceInfo
TextInputStreamHelper;
@@ -145,7 +145,7 @@ void OTextInputStream::implResizeBuffer( void )
}
-//===
+
// XTextInputStream
OUString OTextInputStream::readLine( )
@@ -379,7 +379,7 @@ void OTextInputStream::setEncoding( const OUString
Encoding )
mEncoding = Encoding;
}
-//===
+
// XInputStream
sal_Int32 OTextInputStream::readBytes( Sequence sal_Int8 aData, sal_Int32
nBytesToRead )
@@ -413,7 +413,7 @@ void OTextInputStream::closeInput( )
}
-//===
+
// XActiveDataSink
void OTextInputStream::setInputStream( const Reference XInputStream
aStream )
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index e26d515..6c1988e 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::registry;
namespace io_TextOutputStream
{
-//===
+
// Implementation XTextOutputStream
typedef WeakImplHelper2 XTextOutputStream2, XServiceInfo
TextOutputStreamHelper;
@@ -159,7 +159,7 @@ Sequencesal_Int8 OTextOutputStream::implConvert( const
OUString rSource )
}
-//===
+
// XTextOutputStream
void OTextOutputStream::writeString( const OUString aString )
@@ -192,7 +192,7 @@ void OTextOutputStream::setEncoding( const OUString
Encoding )
mEncoding = Encoding;
}
-//===
+
// XOutputStream
void OTextOutputStream::writeBytes( const Sequence sal_Int8 aData )
throw(NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException)
@@ -226,7 +226,7 @@ void OTextOutputStream::checkOutputStream()
}
-//===
+
// XActiveDataSource
void OTextOutputStream::setOutputStream( const Reference XOutputStream
aStream )
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index af47604..7cf5d49 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -472,9 +472,9 @@ SequenceOUString
OMarkableOutputStream_getSupportedServiceNames(void)
-//
+
// XMarkableInputStream
-//
+
class OMarkableInputStream :
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 260c723..10204c8 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -23,8 +23,7 @@
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
//
-// Therefor the testcode must exist in teststm and the testservice must be
named test.com.sun.star.io.Pipe
-//
+// Therefore the testcode must exist in teststm and the testservice must be
named test.com.sun.star.io.Pipe
#include stdio.h
#include com/sun/star/registry/XImplementationRegistration.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - Repository.mk scp2/inc scp2/source solenv/gbuild
Repository.mk|4 +-- scp2/inc/macros.inc | 22 scp2/source/ooo/ure.scp | 35 --- scp2/source/sdkoo/sdkoo.scp |5 +++ solenv/gbuild/AutoInstall.mk |3 ++ solenv/gbuild/Helper.mk |4 +++ solenv/gbuild/extensions/post_PackageInfo.mk |5 +++ solenv/gbuild/platform/com_MSC_class.mk |1 solenv/gbuild/platform/macosx.mk |2 + solenv/gbuild/platform/mingw.mk |2 + solenv/gbuild/platform/solaris.mk|2 + solenv/gbuild/platform/unxgcc.mk |1 12 files changed, 49 insertions(+), 37 deletions(-) New commits: commit 872312d4bbea4d2fa6f8a3a1eb667e709085d54d Author: Michael Stahl mst...@redhat.com Date: Wed Feb 26 14:23:57 2014 +0100 fdo#75526: sdk: install URE library symlinks / import libs again This is a bit involved because since the LinkTarget now creates the instdir/sdk/lib/* files itself a Package cannot be used; so convert the URE libraries to AutoInstall and add special handling for them to gb_Helper_register_libraries_for_install to create the necessary links in the sdk install-module. (regression from 70c35265f517ef372cb739d4cc64499abf57a838) (cherry picked from commit 482ab0d09620f92eb3618125930dc7c4c8335b5e) Conflicts: solenv/gbuild/AutoInstall.mk fdo#75526: argh missing semicolon (cherry picked from commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3) Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1 Reviewed-on: https://gerrit.libreoffice.org/8365 Tested-by: David Tardon dtar...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com diff --git a/Repository.mk b/Repository.mk index 3977ac3..578ebd4c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -618,7 +618,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif -$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ +$(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ cppuhelper \ purpenvhelper \ salhelper \ @@ -632,7 +632,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pythonloader \ )) -$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ +$(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \ cppu \ sal \ )) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 1ec649d..d55c304 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -165,6 +165,28 @@ ComponentCondition = cond; \ End +#ifdef MACOSX +// links are craeted at configure time by odk/config/setsdkenv_unix.sh.in +#define SDK_LIBRARY_LINK(id,name,target) +#elif defined(WNT) +#define SDK_LIBRARY_LINK(id,name,target) \ +File id \ +TXT_FILE_BODY; \ +Styles = (PACKED); \ +Dir = gid_Dir_Lib_Sdk; \ +Name = name; \ +End +#else +#define SDK_LIBRARY_LINK(id,name,target) \ +Unixlink id \ + BIN_FILE_BODY; \ + Styles = (); \ + Dir = gid_Dir_Lib_Sdk; \ + Name = name; \ + Target = target; \ +End +#endif + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 3cf19c2..0fb18d9 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -94,13 +94,6 @@ End // Public Dynamic Libraries: -File gid_File_Dl_Cppu -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -Name = SCP2_URE_DL_UNO_VER(cppu, 3); -Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Cppu BIN_FILE_BODY; @@ -111,13 +104,6 @@ Unixlink gid_Unixlink_File_Dl_Cppu End #endif -File gid_File_Dl_Cppuhelper -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3); -Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Cppuhelper BIN_FILE_BODY; @@ -128,13 +114,6 @@ Unixlink gid_Unixlink_File_Dl_Cppuhelper End #endif -File gid_File_Dl_PurpEnvHelper -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -Name = SCP2_URE_DL_UNO_COMID_VER(purpenvhelper, 3); -Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_PurpEnvHelper BIN_FILE_BODY; @@ -145,13 +124,6 @@ Unixlink gid_Unixlink_File_Dl_PurpEnvHelper End #endif -File gid_File_Dl_Sal -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -Name = SCP2_URE_DL_UNO_VER(sal, 3); -Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Sal BIN_FILE_BODY; @@ -162,13 +134,6 @@ Unixlink gid_Unixlink_File_Dl_Sal End #endif -File gid_File_Dl_Salhelper -LIB_FILE_BODY; -Dir = SCP2_URE_DL_DIR; -Name = SCP2_URE_DL_UNO_COMID_VER(salhelper, 3); -Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Salhelper BIN_FILE_BODY; diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - sc/inc sc/source
sc/inc/linkuno.hxx |6 --
sc/source/filter/xml/xmlexternaltabi.cxx |8 +++-
sc/source/ui/unoobj/linkuno.cxx | 26 --
3 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 84c3d27619ed124a484196bcc2a3f496bd585ce0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Feb 25 20:40:04 2014 -0500
fdo#72041: Intern strings as we populate the external cache.
This commit covers ods import and UNO API layer.
Change-Id: I3ad1b7cfefe49575694e2351bcba6e5733b009d2
(cherry picked from commit 5706ff70dbb18d03e396fd484bd1392dbcefb6c7)
Reviewed-on: https://gerrit.libreoffice.org/8351
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index b5788e8..0e9e235 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -492,7 +492,7 @@ public:
class ScExternalSheetCacheObj : public cppu::WeakImplHelper1
::com::sun::star::sheet::XExternalSheetCache
{
public:
-explicit ScExternalSheetCacheObj(ScExternalRefCache::TableTypeRef pTable,
size_t nIndex);
+explicit ScExternalSheetCacheObj(ScDocShell* pDocShell,
ScExternalRefCache::TableTypeRef pTable, size_t nIndex);
~ScExternalSheetCacheObj();
// XExternalSheetCache
@@ -518,6 +518,7 @@ private:
ScExternalSheetCacheObj(const ScExternalSheetCacheObj);
private:
+ScDocShell* mpDocShell;
ScExternalRefCache::TableTypeRef mpTable;
size_t mnIndex;
};
@@ -525,7 +526,7 @@ private:
class ScExternalDocLinkObj : public cppu::WeakImplHelper1
::com::sun::star::sheet::XExternalDocLink
{
public:
-ScExternalDocLinkObj(ScExternalRefManager* pRefMgr, sal_uInt16 nFileId);
+ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr,
sal_uInt16 nFileId);
~ScExternalDocLinkObj();
// XExternalDocLink
@@ -564,6 +565,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
private:
+ScDocShell* mpDocShell;
ScExternalRefManager* mpRefMgr;
sal_uInt16 mnFileId;
};
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx
b/sc/source/filter/xml/xmlexternaltabi.cxx
index d4ef04e..c34b622 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -24,7 +24,9 @@
#include token.hxx
#include document.hxx
+#include documentimport.hxx
+#include svl/sharedstringpool.hxx
#include xmloff/nmspmap.hxx
#include xmloff/xmlnmspe.hxx
#include xmloff/xmltoken.hxx
@@ -376,7 +378,11 @@ void ScXMLExternalRefCellContext::EndElement()
if (mbIsNumeric)
aToken.reset(new formula::FormulaDoubleToken(mfCellValue));
else
-aToken.reset(new formula::FormulaStringToken(maCellString));
+{
+ScDocument rDoc = mrScImport.GetDoc().getDoc();
+svl::SharedString aSS =
rDoc.GetSharedStringPool().intern(maCellString);
+aToken.reset(new formula::FormulaStringToken(aSS));
+}
sal_uInt32 nNumFmt = mnNumberFormat = 0 ?
static_castsal_uInt32(mnNumberFormat) : 0;
mrExternalRefInfo.mpCacheTable-setCell(
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 2d19a46..6f86506 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -20,6 +20,7 @@
#include svl/smplhint.hxx
#include sfx2/linkmgr.hxx
#include vcl/svapp.hxx
+#include svl/sharedstringpool.hxx
#include linkuno.hxx
#include miscuno.hxx
@@ -1469,7 +1470,8 @@ uno::Reference sheet::XDDELink
ScDDELinksObj::addDDELink(
//
-ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScExternalRefCache::TableTypeRef
pTable, size_t nIndex) :
+ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell,
ScExternalRefCache::TableTypeRef pTable, size_t nIndex) :
+mpDocShell(pDocShell),
mpTable(pTable),
mnIndex(nIndex)
{
@@ -1492,7 +1494,11 @@ void SAL_CALL
ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR
if (rValue = fVal)
pToken.reset(new FormulaDoubleToken(fVal));
else if (rValue = aVal)
-pToken.reset(new FormulaStringToken(aVal));
+{
+svl::SharedStringPool rPool =
mpDocShell-GetDocument()-GetSharedStringPool();
+svl::SharedString aSS = rPool.intern(aVal);
+pToken.reset(new FormulaStringToken(aSS));
+}
else
// unidentified value type.
return;
@@ -1571,8 +1577,8 @@ sal_Int32 SAL_CALL
ScExternalSheetCacheObj::getTokenIndex()
//
-ScExternalDocLinkObj::ScExternalDocLinkObj(ScExternalRefManager*
[Libreoffice-commits] core.git: registry/source registry/test
registry/source/keyimpl.cxx | 80 +-
registry/source/regimpl.cxx | 88 ++--
registry/source/registry.cxx | 100 +++---
registry/source/regkey.cxx | 188 +--
registry/test/testmerge.cxx | 10 +-
registry/test/testregcpp.cxx |2
6 files changed, 234 insertions(+), 234 deletions(-)
New commits:
commit 75c8d59ddd6ca19ff312c8e507ef05d969704d5a
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:42:37 2014 +0100
Remove visual noise from registry
Change-Id: Ica0c7fe04dae3c52583cc2324bae1cfa5af1e197
Reviewed-on: https://gerrit.libreoffice.org/8292
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 793427e..c8a3ddd 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -30,9 +30,9 @@ using namespace store;
namespace { static char const VALUE_PREFIX[] = $VL_; }
-//*
+
// ORegKey()
-//
+
ORegKey::ORegKey(const OUString keyName, ORegistry* pReg)
: m_refCount(1)
, m_name(keyName)
@@ -42,43 +42,43 @@ ORegKey::ORegKey(const OUString keyName, ORegistry* pReg)
{
}
-//*
+
// ~ORegKey()
-//
+
ORegKey::~ORegKey()
{
OSL_POSTCOND(m_refCount == 0, registry::ORegKey::dtor(): refcount not
zero.);
}
-//*
+
// releaseKey
-//
+
RegError ORegKey::releaseKey(RegKeyHandle hKey)
{
return m_pRegistry-releaseKey(hKey);
}
-//*
+
// createKey
-//
+
RegError ORegKey::createKey(const OUString keyName, RegKeyHandle* phNewKey)
{
return m_pRegistry-createKey(this, keyName, phNewKey);
}
-//*
+
// openKey
-//
+
RegError ORegKey::openKey(const OUString keyName, RegKeyHandle* phOpenKey)
{
return m_pRegistry-openKey(this, keyName, phOpenKey);
}
-//*
+
// openSubKeys
-//
+
RegError ORegKey::openSubKeys(const OUString keyName, RegKeyHandle**
phOpenSubKeys, sal_uInt32* pnSubKeys)
{
RegError _ret = REG_NO_ERROR;
@@ -138,9 +138,9 @@ RegError ORegKey::openSubKeys(const OUString keyName,
RegKeyHandle** phOpenSubK
}
-//*
+
// getKeyNames
-//
+
RegError ORegKey::getKeyNames(const OUString keyName,
rtl_uString*** pSubKeyNames,
sal_uInt32* pnSubKeys)
@@ -198,27 +198,27 @@ RegError ORegKey::getKeyNames(const OUString keyName,
}
-//*
+
// closeKey
-//
+
RegError ORegKey::closeKey(RegKeyHandle hKey)
{
return (m_pRegistry-closeKey(hKey));
}
-//*
+
// deleteKey
-//
+
RegError ORegKey::deleteKey(const OUString keyName)
{
return (m_pRegistry-deleteKey(this, keyName));
}
-//*
+
// getValueType
-//
+
RegError ORegKey::getValueInfo(const OUString valueName, RegValueType*
pValueType, sal_uInt32* pValueSize) const
{
OStoreStreamrValue;
@@ -283,9 +283,9 @@ RegError ORegKey::getValueInfo(const OUString valueName,
RegValueType* pValueTy
}
-//*
+
// setValue
-//
+
RegError ORegKey::setValue(const OUString valueName, RegValueType vType,
RegValue value, sal_uInt32 vSize)
{
OStoreStreamrValue;
@@ -358,9 +358,9 @@ RegError ORegKey::setValue(const OUString valueName,
RegValueType vType, RegVal
return REG_NO_ERROR;
}
-//*
+
// setLongListValue
-//
+
RegError ORegKey::setLongListValue(const OUString valueName, sal_Int32*
pValueList, sal_uInt32 len)
{
OStoreStreamrValue;
@@ -417,9 +417,9 @@ RegError ORegKey::setLongListValue(const OUString
valueName, sal_Int32* pValueL
return REG_NO_ERROR;
}
-//*
+
// setStringListValue
-//
+
RegError ORegKey::setStringListValue(const OUString valueName, sal_Char**
pValueList, sal_uInt32 len)
{
OStoreStreamrValue;
@@ -485,9 +485,9 @@ RegError ORegKey::setStringListValue(const OUString
valueName, sal_Char** pValu
return REG_NO_ERROR;
}
-//*
+
// setUnicodeListValue
-//
+
RegError ORegKey::setUnicodeListValue(const OUString valueName, sal_Unicode**
[Libreoffice-commits] core.git: remotebridges/examples
remotebridges/examples/officeclient.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit da290f39fc3029215bd1dc78731d2cea25f13e92
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:48:19 2014 +0100
Remove visual noise from remotebridges
Change-Id: Id3696781d3480961c516f2a43135415b15cedde0
Reviewed-on: https://gerrit.libreoffice.org/8293
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/remotebridges/examples/officeclient.cxx
b/remotebridges/examples/officeclient.cxx
index cf47d48..d7fd620 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -260,7 +260,7 @@ using namespace remotebridges_officeclient;
extern C
{
-//==
+
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
return sal_False;
}
-//==
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/XStyleSettings.idl | 12 ++--
offapi/com/sun/star/drawing/LineCap.idl |2 +-
offapi/com/sun/star/graphic/PrimitiveFactory2D.idl |2 +-
offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl |6 +++---
offapi/com/sun/star/resource/XResourceBundle.idl|2 +-
offapi/com/sun/star/ucb/LockType.idl|4 ++--
offapi/com/sun/star/ui/ContextChangeEventObject.idl |2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 91ff31b6f7c2fd217518f54396bbca6d4bde98a3
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:32:26 2014 +0100
Remove visual noise from offapi
Change-Id: I3a1064805b686cff932a766aab11ff3b563b5e2e
Reviewed-on: https://gerrit.libreoffice.org/8286
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl
b/offapi/com/sun/star/awt/XStyleSettings.idl
index 23e3329..f9f6d93 100644
--- a/offapi/com/sun/star/awt/XStyleSettings.idl
+++ b/offapi/com/sun/star/awt/XStyleSettings.idl
@@ -49,7 +49,7 @@ interface XStyleSettings
/// specifies the color of the border of active windows
[attribute] ::com::sun::star::util::Color ActiveBorderColor;
-///
+
[attribute] ::com::sun::star::util::Color ActiveColor;
/// specifies the color of the active tab of a tab control
@@ -64,7 +64,7 @@ interface XStyleSettings
/// specifies the color to use for text on buttons
[attribute] ::com::sun::star::util::Color ButtonTextColor;
-///
+
[attribute] ::com::sun::star::util::Color CheckedColor;
/// specifies the dark portion of the shadow to use for UI elements
@@ -73,7 +73,7 @@ interface XStyleSettings
/// specifies the color of the border of inactive windows
[attribute] ::com::sun::star::util::Color DeactiveBorderColor;
-///
+
[attribute] ::com::sun::star::util::Color DeactiveColor;
/// specifies the text color for inactive UI components
@@ -88,10 +88,10 @@ interface XStyleSettings
/// specifies the text color for disabled UI elements
[attribute] ::com::sun::star::util::Color DisableColor;
-///
+
[attribute] ::com::sun::star::util::Color FaceColor;
-///
+
[attribute, readonly] ::com::sun::star::util::Color FaceGradientColor;
/// specifies the background color for dialog input controls
@@ -127,7 +127,7 @@ interface XStyleSettings
/// specifies the text color of label elements in dialogs
[attribute] ::com::sun::star::util::Color LabelTextColor;
-///
+
[attribute] ::com::sun::star::util::Color LightColor;
/// specifies the background color of menu bars
diff --git a/offapi/com/sun/star/drawing/LineCap.idl
b/offapi/com/sun/star/drawing/LineCap.idl
index a0bac79..c48a93b 100644
--- a/offapi/com/sun/star/drawing/LineCap.idl
+++ b/offapi/com/sun/star/drawing/LineCap.idl
@@ -19,7 +19,7 @@
#ifndef __com_sun_star_drawing_LineCap_idl__
#define __com_sun_star_drawing_LineCap_idl__
-//=
+
module com { module sun { module star { module drawing {
/** The LineCap defines rendering of ends of thick lines
diff --git a/offapi/com/sun/star/graphic/PrimitiveFactory2D.idl
b/offapi/com/sun/star/graphic/PrimitiveFactory2D.idl
index 21042cc..82ce400 100644
--- a/offapi/com/sun/star/graphic/PrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/PrimitiveFactory2D.idl
@@ -30,7 +30,7 @@ service PrimitiveFactory2D : XPrimitiveFactory2D;
}; }; }; };
-//
+
#endif
diff --git a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
index 6dfcc424..b5859f7 100644
--- a/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
+++ b/offapi/com/sun/star/graphic/XPrimitiveFactory2D.idl
@@ -22,7 +22,7 @@
#include com/sun/star/uno/XInterface.idl
#include com/sun/star/beans/PropertyValue.idl
-//
+
// predefines
module com { module sun { module star { module drawing {
@@ -30,7 +30,7 @@ module com { module sun { module star { module drawing {
interface XDrawPage;
}; }; }; };
-//
+
module com { module sun { module star { module graphic {
@@ -82,7 +82,7 @@ interface XPrimitiveFactory2D :
::com::sun::star::uno::XInterface
}; }; }; };
-//
+
#endif
diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl
b/offapi/com/sun/star/resource/XResourceBundle.idl
index 09f6649..c0011ac 100644
--- a/offapi/com/sun/star/resource/XResourceBundle.idl
+++
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/hyphenator/hyphen/hreg.cxx |8 --
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx| 34 +
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx| 12 ---
lingucomponent/source/languageguessing/guess.cxx | 10 +-
lingucomponent/source/languageguessing/guesslang.cxx | 23 --
lingucomponent/source/languageguessing/simpleguesser.cxx | 11 ---
lingucomponent/source/lingutil/lingutil.cxx |9 --
lingucomponent/source/lingutil/lingutil.hxx | 12 ---
lingucomponent/source/spellcheck/macosxspell/macreg.mm | 10 +-
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 10 --
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |2
lingucomponent/source/spellcheck/spell/sreg.cxx |8 --
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 38 +--
lingucomponent/source/spellcheck/spell/sspellimp.hxx |8 --
lingucomponent/source/thesaurus/libnth/nthesdta.cxx |7 --
lingucomponent/source/thesaurus/libnth/nthesdta.hxx |3
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 28
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 10 --
lingucomponent/source/thesaurus/libnth/ntreg.cxx |8 --
19 files changed, 29 insertions(+), 222 deletions(-)
New commits:
commit 412c47ded694df2f955b4c590f096238eb549d3d
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Wed Feb 26 16:06:37 2014 +0100
Remove visual noise from lingucomponent
Change-Id: I6021eabab1474c99868f38ecd0d466eb0d97054e
Reviewed-on: https://gerrit.libreoffice.org/8279
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
b/lingucomponent/source/hyphenator/hyphen/hreg.cxx
index e69deab..9142dfa 100644
--- a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hreg.cxx
@@ -25,19 +25,13 @@
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
-
// declaration of external RegEntry-functions defined by the service objects
-//
-
extern void * SAL_CALL Hyphenator_getFactory(
const sal_Char * pImplName,
XMultiServiceFactory * pServiceManager,
void * /*pRegistryKey*/ );
-
// definition of the two functions that are used to provide the services
-//
-
extern C
{
@@ -54,6 +48,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
hyphen_component_getFactory(
}
-///
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 567dc09..0e50008 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -57,13 +57,9 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
-
// min, max
#define Max(a,b) (a b ? a : b)
-///
-
-
Hyphenator::Hyphenator() :
aEvtListeners ( GetLinguMutex() )
{
@@ -105,7 +101,6 @@ PropertyHelper_Hyphenation Hyphenator::GetPropHelper_Impl()
return *pPropHelper;
}
-
Sequence Locale SAL_CALL Hyphenator::getLocales()
throw(RuntimeException)
{
@@ -113,7 +108,6 @@ Sequence Locale SAL_CALL Hyphenator::getLocales()
// this routine should return the locales supported by the installed
// dictionaries.
-
if (!numdict)
{
SvtLinguConfig aLinguCfg;
@@ -217,7 +211,7 @@ Sequence Locale SAL_CALL Hyphenator::getLocales()
}
else
{
-/* no dictionary found so register no dictionaries */
+// no dictionary found so register no dictionaries
numdict = 0;
aDicts = NULL;
aSuppLocales.realloc(0);
@@ -227,8 +221,6 @@ Sequence Locale SAL_CALL Hyphenator::getLocales()
return aSuppLocales;
}
-
-
sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale rLocale)
throw(RuntimeException)
{
@@ -251,7 +243,6 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale
rLocale)
return bRes;
}
-
Reference XHyphenatedWord SAL_CALL Hyphenator::hyphenate( const OUString
aWord,
const ::com::sun::star::lang::Locale aLocale,
sal_Int16 nMaxLeading,
@@ -373,7 +364,7 @@ Reference XHyphenatedWord SAL_CALL
Hyphenator::hyphenate( const OUString aWo
Max(dict-crhmin, Max(dict-crhmin, 2) + Max(0, minTrail -
Max(dict-rhmin, 2))) );
if (bFailed)
{
-//whoops
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
l10ntools/inc/cfgmerge.hxx|8
l10ntools/inc/export.hxx | 24
l10ntools/source/cfgmerge.cxx | 20 ++--
l10ntools/source/export.cxx |8
l10ntools/source/lngmerge.cxx |4 ++--
l10ntools/source/localize.cxx |8
l10ntools/source/merge.cxx| 20 ++--
l10ntools/source/po.cxx | 16
l10ntools/source/pocheck.cxx |4 ++--
l10ntools/source/xmlparse.cxx | 16
l10ntools/source/xrmmerge.cxx | 12 ++--
11 files changed, 70 insertions(+), 70 deletions(-)
New commits:
commit 1a8ba677082ad093f478ed723feea9280b43
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:15:53 2014 +0100
Remove visual noise from l10ntools
Change-Id: Ia10056ae9e1b9adfe74f299afac5c3c84fa8cea7
Reviewed-on: https://gerrit.libreoffice.org/8278
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index d5d5e54..491ebc9 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -31,9 +31,9 @@
typedef boost::unordered_mapOString, OString, OStringHash OStringHashMap;
-//
+
// class CfgStackData
-//
+
class CfgStackData
{
@@ -60,9 +60,9 @@ public:
};
-//
+
// class CfgStack
-//
+
class CfgStack
{
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index b66a556..7e5b3be 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -55,9 +55,9 @@ typedef boost::unordered_mapOString, bool, OStringHash
#define SOURCE_LANGUAGE en-US
#define X_COMMENT x-comment
-//
+
// class ResData
-//
+
#define ID_LEVEL_NULL 0x
#define ID_LEVEL_TEXT 0x0002
@@ -98,9 +98,9 @@ public:
};
-//
+
// class Export
-//
+
#define LIST_NON0x
#define LIST_STRING 0x0001
@@ -185,9 +185,9 @@ public:
};
-//
+
// class MergeEntrys
-//
+
/// Purpose: holds information of data to merge
class MergeEntrys
@@ -224,9 +224,9 @@ public:
};
-//
+
// class MergeDataHashMap
-//
+
class MergeData;
@@ -271,9 +271,9 @@ class MergeDataHashMap
HashMap_t m_aHashMap;
};
-//
+
// class MergeData
-//
+
/// Purpose: holds information of data to merge (one resource)
class MergeData
@@ -296,9 +296,9 @@ public:
bool operator==( ResData *pData );
};
-//
+
// class MergeDataFile
-//
+
/// Purpose: holds information of data to merge, read from PO file
class MergeDataFile
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 74e4e1b..cc44dd3 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -84,9 +84,9 @@ void workOnTokenSet(int nTyp, char * pTokenText) {
}
-//
+
// class CfgStackData
-//
+
CfgStackData* CfgStack::Push(const OString rTag, const OString rId)
{
@@ -95,9 +95,9 @@ CfgStackData* CfgStack::Push(const OString rTag, const
OString rId)
return pD;
}
-//
+
// class CfgStack
-//
+
CfgStack::~CfgStack()
{
@@ -127,9 +127,9 @@ CfgStackData *CfgStack::GetStackData()
return 0;
}
-//
+
// class CfgParser
-//
+
CfgParser::CfgParser()
: pStackData( NULL ),
@@ -329,9 +329,9 @@ void CfgParser::Error(const OString rError)
yyerror(rError.getStr());
}
-//
+
// class CfgExport
-//
+
CfgExport::CfgExport(
const OString rOutputFile,
@@ -389,9 +389,9 @@ void CfgExport::WorkOnText(
}
-//
+
// class CfgMerge
-//
+
CfgMerge::CfgMerge(
const OString rMergeSource, const OString rOutputFile,
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 76cb144..37f34f9 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -142,9 +142,9 @@ int GetError()
}
}
-//
+
// class ResData
-//
+
bool ResData::SetId( const OString rId, sal_uInt16 nLevel )
{
@@ -172,9 +172,9 @@ bool ResData::SetId( const OString rId, sal_uInt16 nLevel )
return false;
}
-//
+
// class Export
-//
+
namespace
{
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 7171f65..2e3a4d6 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -44,9 +44,9 @@ static void lcl_RemoveUTF8ByteOrderMarker( OString rString )
}
-//
+
// class LngParser
-//
+
LngParser::LngParser(const OString rLngFile)
: nError( LNG_OK )
, pLines( NULL )
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 659f689..9d055d5 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -323,17 +323,17 @@ bool includeProject(const OString rProject) {
}
/// Handle one directory in the hierarchy.
-///
+/
/// Ignores symlinks and instead explicitly descends into clone/* or src/*,
/// as the Cygwin symlinks are not supported by osl::Directory on Windows.
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/localize.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 45cc7cfea269c6eff9b0d6eef6f7060c4d156623
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 26 16:05:40 2014 +
fix comments
Change-Id: Iee6557755e4976e023d1c04bde24e3aa1d0fd062
Reviewed-on: https://gerrit.libreoffice.org/8369
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 9d055d5..659f689 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -323,17 +323,17 @@ bool includeProject(const OString rProject) {
}
/// Handle one directory in the hierarchy.
-/
+///
/// Ignores symlinks and instead explicitly descends into clone/* or src/*,
/// as the Cygwin symlinks are not supported by osl::Directory on Windows.
-/
+///
/// @param rUrl the absolute file URL of this directory
-/
+///
/// @param nLevel 0 if this is either the root directory that contains the
/// projects or one of the clone/* or src/* directories that contain the
/// additional projects; -1 if this is the clone directory; 1 if this
/// is a project directory; 2 if this is a directory inside a project
-/
+///
/// @param rProject the name of the project (empty and ignored if nLevel = 0)
/// @param rPotDir the path of pot directory
void handleDirectory(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_connection.hxx|4 ++--
mysqlc/source/mysqlc_databasemetadata.hxx |4 ++--
mysqlc/source/mysqlc_propertyids.cxx |4 ++--
mysqlc/source/mysqlc_propertyids.hxx |8
mysqlc/source/mysqlc_resultsetmetadata.hxx |4 ++--
mysqlc/source/mysqlc_statement.hxx |4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 5d70084bc6277245953f57b6cc7530e48d4a5826
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:19:41 2014 +0100
Remove visual noise from mysqlc
Change-Id: I5ee918bb193ea887e728e271dd4c0fb49a4dd6e9
Reviewed-on: https://gerrit.libreoffice.org/8282
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 0bd1b82..aac93b2 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -100,9 +100,9 @@ namespace connectivity
::com::sun::star::uno::Reference
com::sun::star::util::XStringSubstitution m_xParameterSubstitution;
protected:
-
//
+
// Data attributes
-
//
+
::com::sun::star::uno::WeakReference
::com::sun::star::sdbc::XDatabaseMetaData m_xMetaData;
OWeakRefArray m_aStatements; // vector containing a list
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx
b/mysqlc/source/mysqlc_databasemetadata.hxx
index a6a79e3..f96f142 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -36,9 +36,9 @@ namespace connectivity
typedef ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XResultSet my_XResultSetRef;
using ::com::sun::star::uno::Any;
-//**
+
// Class: ODatabaseMetaData
-//**
+
typedef ::cppu::WeakImplHelper1
::com::sun::star::sdbc::XDatabaseMetaData ODatabaseMetaData_BASE;
diff --git a/mysqlc/source/mysqlc_propertyids.cxx
b/mysqlc/source/mysqlc_propertyids.cxx
index f22d7af..ee59375 100644
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -76,9 +76,9 @@ const sal_Char* getPROPERTY_LOCALE(){ return
Locale; }
const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return
AutoIncrementCreation; }
const sal_Char* getPROPERTY_PRIVILEGES(){ return Privileges; }
-//
+
//= error messages
-//
+
const sal_Char* getERRORMSG_SEQUENCE() { return Function
sequence error; }
const sal_Char* getSQLSTATE_SEQUENCE() { return HY010; }
const sal_Char* getSQLSTATE_GENERAL() { return HY; }
diff --git a/mysqlc/source/mysqlc_propertyids.hxx
b/mysqlc/source/mysqlc_propertyids.hxx
index 8b010a6..98ffd07 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -130,16 +130,16 @@ enum
}/* mysqlc */
}/* connectivity */
-//--
+
#define DECL_PROP1IMPL(varname, type) \
pProperties[nPos++] =
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname),
PROPERTY_ID_##varname, ::getCppuType(static_cast type*(0)),
-//--
+
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
-//--
+
#define DECL_BOOL_PROP1IMPL(varname) \
pProperties[nPos++] =
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname),
PROPERTY_ID_##varname, ::getBooleanCppuType(),
-//--
+
#define DECL_BOOL_PROP0(varname)\
DECL_BOOL_PROP1IMPL(varname) 0)
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx
b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 4bbd720..b92b567 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -33,9 +33,9 @@ namespace connectivity
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
-//**
+
// Class: ResultSetMetaData
-//**
+
typedef ::cppu::WeakImplHelper1
::com::sun::star::sdbc::XResultSetMetaData
[Libreoffice-commits] core.git: jurt/com jurt/test
jurt/com/sun/star/comp/loader/FactoryHelper.java |4 +--
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 24 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e524ecb3c9eedee99a1acd33c785592e9ae3bd54
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:10:01 2014 +0100
Remove visual noise from jurt
Change-Id: I9f2d9d0ee99623495440fd66961b56a73bd4124a
Reviewed-on: https://gerrit.libreoffice.org/8276
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java
b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index e035082..ea7536a 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -170,7 +170,7 @@ public class FactoryHelper {
}
// XComponentContext impl
-
//__
+
public Object createInstanceWithContext(
XComponentContext xContext )
throws com.sun.star.uno.Exception
@@ -236,7 +236,7 @@ public class FactoryHelper {
throw new com.sun.star.uno.Exception(
instantiationException.toString() );
}
}
-
//__
+
public Object createInstanceWithArgumentsAndContext(
Object rArguments[], XComponentContext xContext )
throws com.sun.star.uno.Exception
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index daf129e..26492f1 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -23,18 +23,18 @@ import org.junit.Test;
import static org.junit.Assert.*;
public final class AnyConverter_Test {
-Any anyBool; //
-Any anyChar; //
-Any anyByte; //
-Any anyShort; //
-Any anyInt; //
-Any anyLong; //
-Any anyFloat; //
-Any anyDouble; //
-Any anyStr; //
-Any anyType; //
-Any anyArByte; //
-Any anyVoid; //
+Any anyBool;
+Any anyChar;
+Any anyByte;
+Any anyShort;
+Any anyInt;
+Any anyLong;
+Any anyFloat;
+Any anyDouble;
+Any anyStr;
+Any anyType;
+Any anyArByte;
+Any anyVoid;
Any anyXTypeProvider;
Boolean aBool= new Boolean(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |7
sw/inc/hintids.hxx | 221 +--
sw/source/core/bastyp/init.cxx | 10 -
sw/source/core/doc/docnew.cxx|3
sw/source/core/text/atrstck.cxx | 25 +--
sw/source/filter/html/css1atr.cxx| 11 -
sw/source/filter/html/htmlatr.cxx|7
sw/source/filter/ww8/attributeoutputbase.hxx |6
sw/source/filter/ww8/docxattributeoutput.cxx |8
sw/source/filter/ww8/docxattributeoutput.hxx |6
sw/source/filter/ww8/rtfattributeoutput.cxx |8
sw/source/filter/ww8/rtfattributeoutput.hxx |6
sw/source/filter/ww8/ww8atr.cxx | 31 +++
sw/source/filter/ww8/ww8attributeoutput.hxx |6
sw/source/filter/ww8/ww8par.cxx |5
sw/source/filter/ww8/ww8par6.cxx | 35 +++-
16 files changed, 248 insertions(+), 147 deletions(-)
New commits:
commit 5faf5492741abfd013ae677b1ec2fc06276d8644
Author: Lei De Bin le...@apache.org
Date: Wed Sep 12 04:07:30 2012 +
Resolves: #i119612# fix the order of Hebraic string are changed after..
save as new .doc
* when opening .doc in AOO, preserve the RTL property(property ID is 0x085A)
and export.
Reported by: Lou Qing le
Patch by: Chen Zuo Jun
Review by: Lei De Bin
(cherry picked from commit daa4da26a7ba0c58c79af69fc6624729f7b22c10)
Conflicts:
sw/inc/hintids.hxx
sw/source/core/bastyp/init.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/text/atrstck.cxx
sw/source/filter/ww8/ww8atr.cxx
Change-Id: I2a1788452475e0deebf530aae41e543eae3cd45d
Resolves: #i120935# Insert blank entry for RES_CHRATR_BIDITRL...
and RES_CHRATR_IDCTHINT, to keep the identical res order
(cherry picked from commit 919e99308395c572a7298e6db2b96df8bf7ec3fd)
Conflicts:
sw/source/filter/html/htmlatr.cxx
Change-Id: I3c2a3513de3c146ece583ff40bf3ffb3845f971c
Resolves: #i122867# HTML export - correct function pointer table...
which holds the export functions for certain attributes
(cherry picked from commit 5d963c0c996d50fa1033e7c2da48b5d1c3747f20)
Conflicts:
sw/source/filter/html/css1atr.cxx
Change-Id: I7f31cfab8c654d5c549db1343d1e222f50a42c60
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 995f2ea..d15b353 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -703,6 +703,13 @@ private:
bool ReplaceRangeImpl(SwPaM, OUString const, const bool);
public:
+enum DocumentType {
+DOCTYPE_NATIVE,
+DOCTYPE_MSWORD //This doc medul is come from Ms Word
+};
+DocumentTypemeDocType;
+DocumentTypeGetDocumentType(){ return meDocType; }
+voidSetDocumentType( DocumentType eDocType ) { meDocType =
eDocType; }
/** Life cycle
*/
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index cf911ab..e49255e 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -96,7 +96,8 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
RES_CHRATR_SHADOW, // 41
RES_CHRATR_HIGHLIGHT, // 42
RES_CHRATR_GRABBAG, // 43
-RES_CHRATR_DUMMY3, // 44
+RES_CHRATR_BIDIRTL, // 44
+RES_CHRATR_IDCTHINT,// 45
RES_CHRATR_END
};
@@ -122,27 +123,27 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
- META and METAFIELD must precede CJK_RUBY and INETFMT
*/
RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN ,
-RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN, // 45
-RES_TXTATR_TOXMARK, // 46
-RES_TXTATR_META,// 47
-RES_TXTATR_METAFIELD, // 48
-RES_TXTATR_AUTOFMT, // 49
-RES_TXTATR_INETFMT, // 50
-RES_TXTATR_CHARFMT, // 51
-RES_TXTATR_CJK_RUBY,// 52
-RES_TXTATR_UNKNOWN_CONTAINER, // 53
-RES_TXTATR_INPUTFIELD, // 54
+RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN, // 46
+RES_TXTATR_TOXMARK, // 47
+RES_TXTATR_META,// 48
+RES_TXTATR_METAFIELD, // 49
+RES_TXTATR_AUTOFMT, // 50
+RES_TXTATR_INETFMT, // 51
+RES_TXTATR_CHARFMT, // 52
+RES_TXTATR_CJK_RUBY,// 53
+RES_TXTATR_UNKNOWN_CONTAINER, // 54
+RES_TXTATR_INPUTFIELD, // 55
RES_TXTATR_WITHEND_END,
// all TextAttributes without an end
RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END,
-RES_TXTATR_FIELD =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - da/a4da26a7ba0c58c79af69fc6624729f7b22c10
da/a4da26a7ba0c58c79af69fc6624729f7b22c10 |1 + 1 file changed, 1 insertion(+) New commits: commit 862b4d311263503f4304c30e1bff1e09ad0d6455 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 16:13:55 2014 + Notes added by 'git notes add' diff --git a/da/a4da26a7ba0c58c79af69fc6624729f7b22c10 b/da/a4da26a7ba0c58c79af69fc6624729f7b22c10 new file mode 100644 index 000..8e398bd --- /dev/null +++ b/da/a4da26a7ba0c58c79af69fc6624729f7b22c10 @@ -0,0 +1 @@ +merged as: 5faf5492741abfd013ae677b1ec2fc06276d8644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 91/9e99308395c572a7298e6db2b96df8bf7ec3fd
91/9e99308395c572a7298e6db2b96df8bf7ec3fd |1 + 1 file changed, 1 insertion(+) New commits: commit b96a847f8facc6e0e86262f08739cc0c8d1302d0 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 16:14:41 2014 + Notes added by 'git notes add' diff --git a/91/9e99308395c572a7298e6db2b96df8bf7ec3fd b/91/9e99308395c572a7298e6db2b96df8bf7ec3fd new file mode 100644 index 000..8e398bd --- /dev/null +++ b/91/9e99308395c572a7298e6db2b96df8bf7ec3fd @@ -0,0 +1 @@ +merged as: 5faf5492741abfd013ae677b1ec2fc06276d8644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5d/963c0c996d50fa1033e7c2da48b5d1c3747f20
5d/963c0c996d50fa1033e7c2da48b5d1c3747f20 |1 + 1 file changed, 1 insertion(+) New commits: commit b91a3ad801ad895311a7f4bb7e3b715e034a3f94 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 16:15:15 2014 + Notes added by 'git notes add' diff --git a/5d/963c0c996d50fa1033e7c2da48b5d1c3747f20 b/5d/963c0c996d50fa1033e7c2da48b5d1c3747f20 new file mode 100644 index 000..8e398bd --- /dev/null +++ b/5d/963c0c996d50fa1033e7c2da48b5d1c3747f20 @@ -0,0 +1 @@ +merged as: 5faf5492741abfd013ae677b1ec2fc06276d8644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d8/6bcdfed8ad6db549e84b9984e12274bb8a44d0
d8/6bcdfed8ad6db549e84b9984e12274bb8a44d0 |1 + 1 file changed, 1 insertion(+) New commits: commit beb73974bc227ac993bfc8bf621ac59a4d0f050d Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 26 16:15:37 2014 + Notes added by 'git notes add' diff --git a/d8/6bcdfed8ad6db549e84b9984e12274bb8a44d0 b/d8/6bcdfed8ad6db549e84b9984e12274bb8a44d0 new file mode 100644 index 000..8e398bd --- /dev/null +++ b/d8/6bcdfed8ad6db549e84b9984e12274bb8a44d0 @@ -0,0 +1 @@ +merged as: 5faf5492741abfd013ae677b1ec2fc06276d8644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com javaunohelper/source javaunohelper/test
javaunohelper/com/sun/star/comp/helper/ComponentContext.java
| 16 +++
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
|4 -
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
|2
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
|2
javaunohelper/com/sun/star/lib/uno/helper/Factory.java
| 14 +++---
javaunohelper/source/bootstrap.cxx
|2
javaunohelper/source/preload.cxx
|6 +-
javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
| 22 +-
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
|4 -
9 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 92c2a468a79dd1a4025d44c208dcfeed98a6eb68
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 19:09:34 2014 +0100
Remove visual noise from javaunohelper
Change-Id: Ib359d536070456c1ef403642eba7913a834d365d
Reviewed-on: https://gerrit.libreoffice.org/8275
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 0b3b194..30ff8ea 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -33,17 +33,17 @@ import java.util.Iterator;
import java.util.ArrayList;
-//==
+
class Disposer implements XEventListener
{
private XComponent m_xComp;
-
//--
+
Disposer( XComponent xComp )
{
m_xComp = xComp;
}
-
//__
+
public void disposing( EventObject Source )
{
m_xComp.dispose();
@@ -117,7 +117,7 @@ public class ComponentContext implements XComponentContext,
XComponent
}
// XComponentContext impl
-
//__
+
public Object getValueByName( String rName )
{
Object o = m_table.get( rName );
@@ -210,7 +210,7 @@ public class ComponentContext implements XComponentContext,
XComponent
return Any.VOID;
}
}
-
//__
+
public XMultiComponentFactory getServiceManager()
{
if (m_xSMgr == null)
@@ -222,7 +222,7 @@ public class ComponentContext implements XComponentContext,
XComponent
}
// XComponent impl
-
//__
+
public void dispose()
{
if (DEBUG)
@@ -289,7 +289,7 @@ public class ComponentContext implements XComponentContext,
XComponent
if (DEBUG)
System.err.println( ... finished );
}
-
//__
+
public void addEventListener( XEventListener xListener )
{
if (xListener == null)
@@ -299,7 +299,7 @@ public class ComponentContext implements XComponentContext,
XComponent
m_eventListener.add( xListener );
}
-
//__
+
public void removeEventListener( XEventListener xListener )
{
if (xListener == null)
diff --git
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 7c7a3f4..c598896 100644
---
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -85,7 +85,7 @@ public class InputStreamToXInputStreamAdapter implements
XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must = len.
-//
+
if (bytesRead = 0) {
return(0);
}
@@ -112,7 +112,7 @@ public class InputStreamToXInputStreamAdapter implements
XInputStream {
// Casting bytesRead to an int is okay, since the user can
// only pass in an integer length to read, so the bytesRead
// must = len.
-//
+
if
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/inunx.cxx |2 +-
i18nlangtag/source/isolang/inwnt.cxx |2 +-
i18nlangtag/source/isolang/isolang.cxx |6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c147ef86daa50c64948a31734805ff930bc0e8ec
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:57:10 2014 +0100
Remove visual noise from i18nlangtag
Change-Id: I82680dea7e6d182d4c8047fce60d2cae09d29891
Reviewed-on: https://gerrit.libreoffice.org/8268
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/i18nlangtag/source/isolang/inunx.cxx
b/i18nlangtag/source/isolang/inunx.cxx
index 4637c14..2fb73df 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -33,7 +33,7 @@
#include i18nlangtag/languagetag.hxx
#include i18nlangtag/mslangid.hxx
-// ===
+
static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
diff --git a/i18nlangtag/source/isolang/inwnt.cxx
b/i18nlangtag/source/isolang/inwnt.cxx
index 750e5a2..33e9c3e 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -35,7 +35,7 @@
static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
-// ===
+
static LanguageType GetSVLang( LANGID nWinLangId )
{
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 95f01ca..afd9cf5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -27,7 +27,7 @@
using namespace com::sun::star;
-// ===
+
static const LanguageType kSAME = 0x;
@@ -900,7 +900,7 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
{ LANGUAGE_DONTKNOW,NULL } // marks end
of table
};
-// ===
+
// static
void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
@@ -1129,7 +1129,7 @@ com::sun::star::lang::Locale
MsLangId::Conversion::getLocale( const IsoLanguageS
return aLastResortFallbackEntry.getLocale();
}
-// ===
+
// static
LanguageType MsLangId::Conversion::convertPrivateUseToLanguage( const
OUString rPriv )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 52c5d1a70df5cc483b85a20e61a18dd8b8d4a045
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Feb 26 17:28:17 2014 +0100
CppunitTest_sw_ooxmlexport: restore this test
It was crashing, as a quick-fix 43feacd5330b5652b58e8a75a0f41a78ee6ebe1c
(sw: fix build, 2014-02-08) disabled the test. I wanted to fix this
properly today, but it was already working.
Change-Id: Ifbfa82bc907d6c4bd8ec398472f751714c721b09
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 10fec59..675a012 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2297,7 +2297,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73556,fdo73556.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(3751), tableWidth);
}
-/* FIXME this still crashes
DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
test_segfault_while_save.docx)
{
// fdo#74499
@@ -2305,7 +2304,7 @@ DECLARE_OOXMLEXPORT_TEST(testSegFaultWhileSave,
test_segfault_while_save.docx)
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2], w).match(6138));
-}*/
+}
DECLARE_OOXMLEXPORT_TEST(fdo69656, Table_cell_auto_width_fdo69656.docx)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vertical text alignment for frames
Hi Tamás, Zolnai Tamás schrieb: Hi Regina, The new property specify whether the content of the frame positioned vertically at the top/center/bottom of the frame. Of course it doesn't have effect when there is no additional space. * A frame can contain nearly a whole document including headings, paragraph, tables, graphic, or sections. * The frame content is sensible to the compatibility settings regarding spacing. * Register true might be enabled. These things are true for table cells too, aren't they? From a user point of view, most things exist for both, that is true. From a ODF point of view, tables and frames are quite different. There exist no anchor to cell in Writer-tables, but anchor to frame exists. What behavior do you will implement for anchored to frame objects? I personally think, that they should not be aligned by the vertical alignment property, but follow their position information. BTW, the vertical alignment in table cells does not work when graphics present, which are not anchored as characters. * The content of a frame may float to a linked frame. Yeah, that's a special case, which I have to think of during implementation. * The height of a frame is often fitting to content. I don't know it is often or not, but I can imagine user cases when this alignment can be useful. It is the default setting. The main thing is consistency. If we have the feature of vertical alignment for containers like text boxes and tables, then why don't we have it for frames too? Tables belong to a different style:family. Tables can exist without draw:frame element. You can compare frames and other graphics, because they are equal in ODF. But tables are different. Exists an attribute for this in ODF? Yes, it is called draw:textarea-vertical-align and is listed into style:graphic-properties which specifies formatting properties for chart, draw, graphic, and frame elements. OK, I have found it. But for tables it is style:vertical-align. Please, do not get me wrong. I'm just very cautious in terms of new features. And now to your question: I would not put it on the dialog page Type, because there are properties collected, which describe the relationship of a frame/shape to its surroundings. But the alignment is a property with regard to its content. Therefore I thing the dialog page Options would be more logical. Besides that, there is more free space on page Options. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/filter/ppt/pptin.cxx | 12 ---
sd/source/ui/dlg/custsdlg.cxx|5
sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c | 16 ---
sd/source/ui/slideshow/slideshowviewimpl.cxx |2 -
4 files changed, 35 deletions(-)
New commits:
commit 6fc2bd0094a23aafadeef3f4a8c2803d621a588d
Author: Thorsten Behrens t...@documentfoundation.org
Date: Wed Feb 26 17:50:46 2014 +0100
Fixup whitespace changes, remove commented code.
This is a light touchup of 2ef9df8aee696993d9eb235fd36caa4cbcfd3624
Change-Id: Icfaf6fb0111c85b5f78010b16bdda0e237419323
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 605d22e..b6f1c66 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -571,9 +571,7 @@ sal_Bool ImplSdPPTImport::Import()
SfxStyleSheet* pSheet;
if ( nMasterNum == 1 )
{
-
// standardsheet
-
pSheet =
(SfxStyleSheet*)mpDoc-GetStyleSheetPool()-Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME),
SD_STYLE_FAMILY_GRAPHICS );
if ( pSheet )
{
@@ -621,7 +619,6 @@ sal_Bool ImplSdPPTImport::Import()
// set stylesheets
-
if ( pPage-GetPageKind() == PK_STANDARD )
{
sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE;
@@ -635,7 +632,6 @@ sal_Bool ImplSdPPTImport::Import()
}
// titelstylesheet
-
pSheet = pPage-GetStyleSheetForPresObj( PRESOBJ_TITLE
);
if ( pSheet )
{
@@ -648,7 +644,6 @@ sal_Bool ImplSdPPTImport::Import()
}
// outlinerstylesheet
-
sal_uInt16 nLevel;
PPTParagraphObj* pParagraphs[ 9 ];
PPTParagraphObj* pPreviousPara = NULL;
@@ -676,7 +671,6 @@ sal_Bool ImplSdPPTImport::Import()
for ( nLevel = 0; nLevel 9; delete pParagraphs[
nLevel++ ] ) ;
// subtitle stylesheet
-
pSheet = pPage-GetStyleSheetForPresObj( PRESOBJ_TEXT
);
if ( pSheet )
{
@@ -712,7 +706,6 @@ sal_Bool ImplSdPPTImport::Import()
SetPageNum( i, PPT_MASTERPAGE );
// importing master page objects
-
PptSlidePersistList* pList = GetPageList( eAktPageKind );
PptSlidePersistEntry* pPersist = ( pList ( nAktPageNum
pList-size() ) )
? (*pList)[ nAktPageNum ]
: NULL;
@@ -831,7 +824,6 @@ sal_Bool ImplSdPPTImport::Import()
// background object
-
pObj = pMPage-GetObj( 0 );
if ( pObj pObj-GetObjIdentifier() == OBJ_RECT )
{
@@ -869,7 +861,6 @@ sal_Bool ImplSdPPTImport::Import()
}
// importing slide pages
-
{
sal_uInt32 nFPosMerk = rStCtrl.Tell();
PptPageKind ePageKind = eAktPageKind;
@@ -1040,7 +1031,6 @@ sal_Bool ImplSdPPTImport::Import()
}
// create handout and note pages
-
bOk = mpDoc-CreateMissingNotesAndHandoutPages();
if ( bOk )
{
@@ -1048,7 +1038,6 @@ sal_Bool ImplSdPPTImport::Import()
{
// set AutoLayout
-
SetPageNum( i, PPT_SLIDEPAGE );
SdPage* pPage = mpDoc-GetSdPage( i, PK_STANDARD );
AutoLayout eAutoLayout = AUTOLAYOUT_NONE;
@@ -1167,7 +1156,6 @@ sal_Bool ImplSdPPTImport::Import()
}
// handout master page: auto layout
-
SdPage* pHandoutMPage = mpDoc-GetMasterSdPage( 0, PK_HANDOUT );
pHandoutMPage-SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True
);
}
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 19a6bac..8c7f54d 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -385,13 +385,10 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *,
p )
}
else if( p == m_pBtnRemove )
{
-// sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos();
SvTreeListEntry* pEntry = m_pLbCustomPages-FirstSelected();
if( pEntry )
{
sal_uLong nPos = m_pLbCustomPages-GetModel()-GetAbsPos( pEntry );
-// rpCustomShow-Remove( nPos );
-// aLbCustomPages.RemoveEntry( nPos );
m_pLbCustomPages-GetModel()-Remove(
m_pLbCustomPages-GetModel()-GetEntryAtAbsPos( nPos ) );
bModified = sal_True;
@@ -399,8 +396,6 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p
)
}
else if( p == m_pEdtName )
{
-// rpCustomShow-SetName(
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 Barry Broom barry.br...@ipmail.org.uk changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |barry.br...@ipmail.org.uk |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Vertical text alignment for frames
Hi Regina, 2014-02-26 17:50 GMT+01:00 Regina Henschel rb.hensc...@t-online.de: Hi Tamás, Zolnai Tamás schrieb: Hi Regina, The new property specify whether the content of the frame positioned vertically at the top/center/bottom of the frame. Of course it doesn't have effect when there is no additional space. * A frame can contain nearly a whole document including headings, paragraph, tables, graphic, or sections. * The frame content is sensible to the compatibility settings regarding spacing. * Register true might be enabled. These things are true for table cells too, aren't they? From a user point of view, most things exist for both, that is true. From a ODF point of view, tables and frames are quite different. There exist no anchor to cell in Writer-tables, but anchor to frame exists. What behavior do you will implement for anchored to frame objects? I personally think, that they should not be aligned by the vertical alignment property, but follow their position information. BTW, the vertical alignment in table cells does not work when graphics present, which are not anchored as characters. Yes, I see. I agree with you. I think this alignment should move the text area and if an object is anchored to this text area (to character, as character, to paragraph) then it should move too, but others should be untouched by this property. * The content of a frame may float to a linked frame. Yeah, that's a special case, which I have to think of during implementation. * The height of a frame is often fitting to content. I don't know it is often or not, but I can imagine user cases when this alignment can be useful. It is the default setting. The main thing is consistency. If we have the feature of vertical alignment for containers like text boxes and tables, then why don't we have it for frames too? Tables belong to a different style:family. Tables can exist without draw:frame element. You can compare frames and other graphics, because they are equal in ODF. But tables are different. Exists an attribute for this in ODF? Yes, it is called draw:textarea-vertical-align and is listed into style:graphic-properties which specifies formatting properties for chart, draw, graphic, and frame elements. OK, I have found it. But for tables it is style:vertical-align. Please, do not get me wrong. I'm just very cautious in terms of new features. I won't. :) And now to your question: I would not put it on the dialog page Type, because there are properties collected, which describe the relationship of a frame/shape to its surroundings. But the alignment is a property with regard to its content. Therefore I thing the dialog page Options would be more logical. Besides that, there is more free space on page Options Makes sense, thanks. Regards, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/macab/MacabStatement.cxx |4 ++--
connectivity/source/drivers/macab/MacabStatement.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit eb4187edbe411ed26861ec8c5b4f29708907cbf4
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 26 18:47:09 2014 +0100
std::exception fixup
Change-Id: I36c9f19580ef2a8e87d68fcc7f3cc3fd56ec7605
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 6b85a0e..1081b8b 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -362,7 +362,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet
*pResult) const throw(SQLE
}
}
-Any SAL_CALL MacabCommonStatement::queryInterface( const Type rType )
throw(RuntimeException)
+Any SAL_CALL MacabCommonStatement::queryInterface( const Type rType )
throw(RuntimeException, std::exception)
{
Any aRet = MacabCommonStatement_BASE::queryInterface(rType);
if (!aRet.hasValue())
@@ -370,7 +370,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const
Type rType ) throw(Ru
return aRet;
}
-Sequence Type SAL_CALL MacabCommonStatement::getTypes( )
throw(RuntimeException)
+Sequence Type SAL_CALL MacabCommonStatement::getTypes( )
throw(RuntimeException, std::exception)
{
::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference
XMultiPropertySet *)0 ),
::getCppuType( (const Reference
XFastPropertySet *)0 ),
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx
b/connectivity/source/drivers/macab/MacabStatement.hxx
index 75da079..415b426 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -107,11 +107,11 @@ namespace connectivity
virtual void SAL_CALL acquire() throw();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
const ::com::sun::star::uno::Type rType
-) throw(::com::sun::star::uno::RuntimeException);
+) throw(::com::sun::star::uno::RuntimeException,
std::exception);
// XTypeProvider
virtual ::com::sun::star::uno::Sequence
::com::sun::star::uno::Type SAL_CALL getTypes(
-) throw(::com::sun::star::uno::RuntimeException);
+) throw(::com::sun::star::uno::RuntimeException,
std::exception);
// XPropertySet
virtual ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySetInfo SAL_CALL getPropertySetInfo(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gvfs/gvfs_content.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 18ae3de84085c399e94ff4b94e9a83b168325283
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 26 19:31:25 2014 +0100
std::exception fixup for --enable-gnome-vfs
Change-Id: Ia0a903a38f8ae2897d0d9d6159597f720bbc24a5
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx
b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 3b481c8..ef33a85 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -163,7 +163,7 @@ void SAL_CALL Content::release()
ContentImplHelper::release();
}
uno::Any SAL_CALL Content::queryInterface( const uno::Type rType )
-throw ( uno::RuntimeException )
+throw ( uno::RuntimeException, std::exception )
{
// Note: isFolder may require network activities! So call it only
// if it is really necessary!!!
@@ -183,7 +183,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type
rType )
XTYPEPROVIDER_COMMON_IMPL( Content );
uno::Sequence uno::Type SAL_CALL Content::getTypes()
-throw( uno::RuntimeException )
+throw( uno::RuntimeException, std::exception )
{
static cppu::OTypeCollection *pFolderCollection = NULL;
static cppu::OTypeCollection *pFileCollection = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com officecfg/registry
offapi/com/sun/star/modules.idl |2 +-
officecfg/registry/schema/org/openoffice/Office/Math.xcs |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 50b1dce863f820d1e0280f6c78797a421e8ed69a
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 26 20:13:14 2014 +0100
Typo: (S/s)caleable - (S/s)calable
Change-Id: Ia10f8f36395c7f69dca297efc01c1061ef61ed6e
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index fe80558..5a5427b 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -350,7 +350,7 @@ module smarttags {};
/// Formatting and layout style and style sheet interfaces.
module style {};
-/// Interfaces for import/export of Scaleable Vector Format.
+/// Interfaces for import/export of Scalable Vector Format.
module svg {};
/// Host operating system integration interfaces.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 0dbf736..c4f71ba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -409,7 +409,7 @@
!-- OldLocation: Soffice.cfg --
!-- UIHints: Format - Spacing - Category - Brackets - Scale all
brackets --
info
- descAttempts to scale non-scaleable brackets to fit the size of
the arguments./desc
+ descAttempts to scale non-scalable brackets to fit the size of the
arguments./desc
labelScale normal brackets/label
/info
valuefalse/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 49 ---
sw/source/filter/ww8/docxexport.cxx | 16 +++-
sw/source/filter/ww8/docxexport.hxx |2 -
writerfilter/source/dmapper/OLEHandler.cxx | 45
writerfilter/source/dmapper/OLEHandler.hxx |4 ++
6 files changed, 102 insertions(+), 16 deletions(-)
New commits:
commit 1c993627d893c62ab8f01355895206374bf4eb6c
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Wed Feb 26 18:29:44 2014 +0100
sw: write other types of embeddings properly to docx
Improves patch 1428ec6f4e2bfe0d8654a9ccc713e274e08c6423
When embedding an object into a docx, several things interact:
* The properties in the o:OLEObject tag in document.xml
* The ContentType for the file defined in [Content_Types].xml
* The Type of the Relationship defined in document.xml.rels
You need the right combination of those three elements for Word to
properly recognize the embeddings in exported documents.
To know which values must be written, I store some interoperability
information in the import phase in the document grab bag. The
relevant information is the value of the ProgID attribute in the
o:OLEObject tag.
I have defined three cases depending on the value of ProgID, but more
could be needed in the future:
* Embedded xlsx sheet.
* Embedded pptx presentation.
* Generic OLE, this should work with embedded odt/ods in combination
with the ProgID attribute stored in the import phase.
Change-Id: I26336cb3fe47bd33e1cef11dd1c7edcf390f2e56
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 675a012..12e5992 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2579,7 +2579,7 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx,
embedded-xlsx.docx)
int nImageFiles = 0;
for (int i=0; inames.getLength(); i++)
{
-if(names[i].startsWith(word/embeddings/Microsoft_Excel_Worksheet))
+if(names[i].startsWith(word/embeddings/oleObject))
nSheetFiles++;
if(names[i].startsWith(word/media/image))
nImageFiles++;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 362c1c8..1b91a13 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3568,12 +3568,53 @@ void DocxAttributeOutput::WritePostponedOLE()
SAL_INFO( sw.ww8, OSL_THIS_FUNC );
+// get interoperability information about embedded objects
+uno::Reference beans::XPropertySet xPropSet(
m_rExport.pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW );
+OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+uno::Sequence beans::PropertyValue aGrabBag, aObjectsInteropList;
+xPropSet-getPropertyValue( pName ) = aGrabBag;
+for( sal_Int32 i=0; i aGrabBag.getLength(); ++i )
+if ( aGrabBag[i].Name == EmbeddedObjects )
+{
+aGrabBag[i].Value = aObjectsInteropList;
+break;
+}
+
for( std::list PostponedOLE ::iterator it = m_postponedOLE-begin();
it != m_postponedOLE-end();
++it )
{
+SwOLEObj aObject = it-object-GetOLEObj();
+uno::Reference embed::XEmbeddedObject xObj( aObject.GetOleRef() );
+comphelper::EmbeddedObjectContainer* aContainer =
aObject.GetObject().GetContainer();
+OUString sObjectName = aContainer-GetEmbeddedObjectName( xObj );
+
+// set some attributes according to the type of the embedded object
+OUString sProgID, sMediaType, sRelationType;
+for( sal_Int32 i=0; i aObjectsInteropList.getLength(); ++i )
+if ( aObjectsInteropList[i].Name == sObjectName )
+{
+aObjectsInteropList[i].Value = sProgID;
+break;
+}
+if( sProgID.startsWith(Excel.Sheet) )
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+}
+else if( sProgID.startsWith(PowerPoint.Show) )
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.presentationml.presentation;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+}
+else
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.oleObject;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject;;
+}
+
// write embedded file
-OString sId = m_rExport.WriteOLENode( *it-object );
+OString sId =
[Libreoffice-commits] core.git: 3 commits - i18nlangtag/source i18npool/Library_localedata_others.mk i18npool/source include/i18nlangtag svtools/source
i18nlangtag/source/isolang/isolang.cxx |1 i18npool/Library_localedata_others.mk |1 i18npool/source/localedata/data/lgr_SB.xml | 359 + i18npool/source/localedata/localedata.cxx |3 include/i18nlangtag/lang.h |1 svtools/source/misc/langtab.src|1 6 files changed, 365 insertions(+), 1 deletion(-) New commits: commit 1371fbf08bae2e1d2282af19af9ce3c20ebe03f7 Author: Eike Rathke er...@redhat.com Date: Wed Feb 26 20:23:25 2014 +0100 added M-D abbreviated DateAcceptancePattern to [lgr-SB], fdo#72512 Change-Id: Ia42f4a112a240ed38a9e8e53e4e92b48e9cacc10 diff --git a/i18npool/source/localedata/data/lgr_SB.xml b/i18npool/source/localedata/data/lgr_SB.xml index 42f6369..f156c80 100644 --- a/i18npool/source/localedata/data/lgr_SB.xml +++ b/i18npool/source/localedata/data/lgr_SB.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$$-692] +DateAcceptancePatternM-D/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeneral/FormatCode /FormatElement commit 7f1d023cb8879cadb6ffeda6dbf9b1c8e83007e7 Author: Eike Rathke er...@redhat.com Date: Wed Feb 26 20:20:21 2014 +0100 added Lengo [lgr-SB] locale data, fdo#72512 Change-Id: I1aa5e635448e2076f60c749e2640d9689a63f829 diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index f1f1785..03447dc 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_ky_KG \ CustomTarget/i18npool/localedata/localedata_ldi_CG \ CustomTarget/i18npool/localedata/localedata_lg_UG \ + CustomTarget/i18npool/localedata/localedata_lgr_SB \ CustomTarget/i18npool/localedata/localedata_lif_NP \ CustomTarget/i18npool/localedata/localedata_ln_CD \ CustomTarget/i18npool/localedata/localedata_lo_LA \ diff --git a/i18npool/source/localedata/data/lgr_SB.xml b/i18npool/source/localedata/data/lgr_SB.xml new file mode 100644 index 000..42f6369 --- /dev/null +++ b/i18npool/source/localedata/data/lgr_SB.xml @@ -0,0 +1,358 @@ +?xml version=1.0 encoding=UTF-8 ? +!DOCTYPE Locale SYSTEM 'locale.dtd' +Locale versionDTD=2.0.3 allowUpdateFromCLDR=no version=1.0 + LC_INFO +Language + LangIDlgr/LangID + DefaultNameLengo/DefaultName +/Language +Country + CountryIDSB/CountryID + DefaultNameSolomon Islands/DefaultName +/Country + /LC_INFO + LC_CTYPE unoid=generic +Separators + DateSeparator-/DateSeparator + ThousandSeparator,/ThousandSeparator + DecimalSeparator./DecimalSeparator + TimeSeparator:/TimeSeparator + Time100SecSeparator./Time100SecSeparator + ListSeparator;/ListSeparator + LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator + LongDateDaySeparator, /LongDateDaySeparator + LongDateMonthSeparator /LongDateMonthSeparator + LongDateYearSeparator /LongDateYearSeparator +/Separators +Markers + QuotationStartâ/QuotationStart + QuotationEndâ/QuotationEnd + DoubleQuotationStartâ/DoubleQuotationStart + DoubleQuotationEndâ/DoubleQuotationEnd +/Markers +TimeAMAM/TimeAM +TimePMPM/TimePM +MeasurementSystemmetric/MeasurementSystem + /LC_CTYPE + LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$$-692] +FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 + FormatCodeGeneral/FormatCode +/FormatElement +FormatElement msgid=FixedFormatskey2 default=true type=short usage=FIXED_NUMBER formatindex=1 + FormatCode0/FormatCode +/FormatElement +FormatElement msgid=FixedFormatskey3 default=false type=medium usage=FIXED_NUMBER formatindex=2 + FormatCode0.00/FormatCode +/FormatElement +FormatElement msgid=FixedFormatskey4 default=false type=short usage=FIXED_NUMBER formatindex=3 + FormatCode#,##0/FormatCode +/FormatElement +FormatElement msgid=FixedFormatskey5 default=false type=medium usage=FIXED_NUMBER formatindex=4 + FormatCode#,##0.00/FormatCode +/FormatElement +FormatElement msgid=FixedFormatskey6 default=false type=medium usage=FIXED_NUMBER formatindex=5 + FormatCode#,###.00/FormatCode +/FormatElement +FormatElement msgid=ScientificFormatskey1 default=true type=medium usage=SCIENTIFIC_NUMBER formatindex=6 + FormatCode0.00E+00/FormatCode +/FormatElement +FormatElement msgid=ScientificFormatskey2 default=false type=medium usage=SCIENTIFIC_NUMBER formatindex=7 + FormatCode0.00E+000/FormatCode +/FormatElement +FormatElement msgid=PercentFormatskey1 default=true type=short
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a395c9fa387eabf2d09360f1023f5e3e66af21a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 26 20:29:08 2014 +0100
loplugin:literaltoboolconversion
Change-Id: I9f601252a24e935e81716213a6733ee2adb1489f
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c3aa747..9e3596c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2862,12 +2862,12 @@ void SwWW8ImplReader::Read_Bidi(sal_uInt16, const
sal_uInt8* pData, short nLen)
{
if( nLen 0 ) //Property end
{
-bBidi = sal_False;
+bBidi = false;
pCtrlStck-SetAttr(*pPaM-GetPoint(),RES_CHRATR_BIDIRTL);
}
else//Property start
{
-bBidi = sal_True;
+bBidi = true;
sal_uInt8 nBidi = *pData;
NewAttr( SfxInt16Item( RES_CHRATR_BIDIRTL, (nBidi!=0)? 1 : 0 ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
