[Libreoffice-commits] core.git: dictionaries helpcontent2 l10ntools/source translations
dictionaries |2 +-
helpcontent2 |2 +-
l10ntools/source/cfgmerge.cxx |7 ++-
l10ntools/source/export.cxx | 28 +++-
l10ntools/source/lngmerge.cxx |3 +--
l10ntools/source/xrmmerge.cxx |7 +++
translations |2 +-
7 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 5acc994f4ed3e118453fb493226b751a6d9d3bce
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 06:37:05 2013 +0200
Remove obsolote 'empty string - -' behaviour
Change-Id: I1d81d4c5716c397b84c0a8959b21beacbbbf1138
diff --git a/dictionaries b/dictionaries
index 36776c3..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
diff --git a/helpcontent2 b/helpcontent2
index 4fa8716..f25d6a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4fa871622ae5cb247520fc113d2278be758fa62c
+Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 44f9896..dcbcfb9 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -500,8 +500,7 @@ void CfgMerge::WorkOnText(OString rText, const OString
rLangIndex)
OString sContent;
pEntrys-GetText( sContent, STRING_TYP_TEXT, rLangIndex );
-if ( !rLangIndex.equalsIgnoreAsciiCase(en-US)
-( sContent != - ) !sContent.isEmpty())
+if ( !rLangIndex.equalsIgnoreAsciiCase(en-US)
!sContent.isEmpty())
{
rText = helper::QuotHTML( rText );
}
@@ -530,9 +529,7 @@ void CfgMerge::WorkOnResourceEnd()
OString sContent;
pEntrys-GetText( sContent, STRING_TYP_TEXT, sCur , sal_True );
if (
-(
!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(en-US)) )
-
-( sContent != - ) !sContent.isEmpty())
+( !sCur.equalsIgnoreAsciiCase(en-US) )
!sContent.isEmpty())
{
OString sText = helper::QuotHTML( sContent);
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 1cbb426..d4d6e04 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -919,26 +919,28 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool
bCreateNew )
sXQHText = pResData-sQuickHelpText[ SOURCE_LANGUAGE ];
sXTitle = pResData-sTitle[ SOURCE_LANGUAGE ];
-if (sXText.isEmpty())
-sXText = -;
-
-ConvertExportContent(sXText);
-ConvertExportContent(sXHText);
-ConvertExportContent(sXQHText);
-ConvertExportContent(sXTitle);
-
-common::writePoEntry(
-Transex3, *aOutput.mPo, global::inputPathname,
-pResData-sResTyp, sGID, sLID, sXHText, sXText);
+if( !sXText.isEmpty() )
+{
+ConvertExportContent(sXText);
+ConvertExportContent(sXHText);
+common::writePoEntry(
+Transex3, *aOutput.mPo, global::inputPathname,
+pResData-sResTyp, sGID, sLID, sXHText, sXText);
+}
if( !sXQHText.isEmpty() )
+{
+ConvertExportContent(sXQHText);
common::writePoEntry(
Transex3, *aOutput.mPo, global::inputPathname,
pResData-sResTyp,
sGID, sLID, OString(), sXQHText, PoEntry::TQUICKHELPTEXT );
-
+}
if( !sXTitle.isEmpty() )
+{
+ConvertExportContent(sXTitle);
common::writePoEntry(
Transex3, *aOutput.mPo, global::inputPathname,
pResData-sResTyp,
sGID, sLID, OString(), sXTitle, PoEntry::TTITLE );
+}
if ( bCreateNew ) {
pResData-sText[ SOURCE_LANGUAGE ] = ;
@@ -1508,7 +1510,7 @@ void Export::ResData2Output( MergeEntrys *pEntry,
sal_uInt16 nType, const OStrin
OString sText;
sal_Bool bText = pEntry-GetText( sText, nType, sCur , sal_True );
-if ( bText !sText.isEmpty() sText != - ) {
+if ( bText !sText.isEmpty() ) {
OString sOutput;
if ( bNextMustBeDefineEOL) {
if ( bFirst )
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index f343b26..273fe19 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -297,8 +297,7 @@ sal_Bool LngParser::Merge(
pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
if( sCur == qtz )
sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
-if (( !sNewText.isEmpty())
-!((
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM(x-comment))) ( sNewText == -
Master branch now requires liborcus 0.5.0 or higher.
Hi there, FYI, I've updated liborcus on the master branch just now. You now need liborcus 0.5.0 or higher in order to build. It took me 2 days just to integrate this piece, but I've ensured that it builds both on Linux and Windows. So hopefully no major build issues. Best, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/inc svx/source
svx/inc/svx/svddrgmt.hxx | 10 ++-
svx/inc/svx/svdoedge.hxx |5 +
svx/source/svdraw/svddrgmt.cxx | 112 +++--
svx/source/svdraw/svdoedge.cxx | 89
4 files changed, 198 insertions(+), 18 deletions(-)
New commits:
commit c1a2f580f0a5a479282cfa7ffa538de6d30b216a
Author: Armin Le Grand a...@apache.org
Date: Tue Jun 19 09:47:15 2012 +
Resolves: #i54102# added support for rotation, shear and mirror for
SdrEdgeObj
i.e. Edges, Connectors
added interactive preview, allowed these actions for editing
(cherry picked from commit f8721f5f94f74522eae36dc6dc054b983384fac9)
Conflicts:
svx/source/svdraw/svddrgmt.cxx
svx/source/svdraw/svdoedge.cxx
Change-Id: I20b971674e683a25f70f6d2e2f4b5231f38638bc
Related: i#54102# Removed IsInserted() check...
for doing transformations to have them on interactions
(cherry picked from commit 3ca8c0e04015fcd945a66e254d845dc9081aa5e5)
Conflicts:
svx/source/svdraw/svdoedge.cxx
Change-Id: If55e5f0d4bb5aef7f602fdcd03d51014390e8d2a
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index da6715d..3fc7fbb 100644
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/svx/inc/svx/svddrgmt.hxx
@@ -91,6 +91,12 @@ public:
SdrDragEntrySdrObject(const SdrObject rOriginal,
sdr::contact::ObjectContact rObjectContact, bool bModify);
virtual ~SdrDragEntrySdrObject();
+// #i54102# Split createPrimitive2DSequenceInCurrentState in
prepareCurrentState and processing,
+// added accessors to original and clone
+void prepareCurrentState(SdrDragMethod rDragMethod);
+const SdrObject getOriginal() const { return maOriginal; }
+SdrObject* getClone() { return mpClone; }
+
virtual drawinglayer::primitive2d::Primitive2DSequence
createPrimitive2DSequenceInCurrentState(SdrDragMethod rDragMethod);
};
@@ -140,8 +146,8 @@ private:
protected:
// access for derivated classes to maSdrDragEntries
-void clearSdrDragEntries() { for(sal_uInt32 a(0); a
maSdrDragEntries.size(); a++) { delete maSdrDragEntries[a]; }
maSdrDragEntries.clear(); }
-void addSdrDragEntry(SdrDragEntry* pNew) { if(pNew) {
maSdrDragEntries.push_back(pNew); }}
+void clearSdrDragEntries();
+void addSdrDragEntry(SdrDragEntry* pNew);
virtual void createSdrDragEntries();
virtual void createSdrDragEntryForSdrObject(const SdrObject rOriginal,
sdr::contact::ObjectContact rObjectContact, bool bModify);
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 70ca454..ea0968c 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -262,6 +262,11 @@ public:
virtual void NbcMove(const Size aSize);
virtual void NbcResize(const Point rRefPnt, const Fraction aXFact, const
Fraction aYFact);
+// #i54102# added rotate, mirrorn and shear support
+virtual void NbcRotate(const Point rRef, long nWink, double sn, double
cs);
+virtual void NbcMirror(const Point rRef1, const Point rRef2);
+virtual void NbcShear(const Point rRef, long nWink, double tn, bool
bVShear);
+
// #102344# Added missing implementation
virtual void NbcSetAnchorPos(const Point rPnt);
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 35f4b9cb..bd0aaac 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -22,7 +22,6 @@
#include tools/bigint.hxx
#include vcl/svapp.hxx
-
#include svx/xattr.hxx
#include svx/xpoly.hxx
#include svx/svdetc.hxx
@@ -68,6 +67,8 @@
#include basegfx/matrix/b2dhommatrixtools.hxx
#include drawinglayer/attribute/sdrlineattribute.hxx
#include drawinglayer/attribute/sdrlinestartendattribute.hxx
+#include map
+#include vector
@@ -142,14 +143,12 @@ SdrDragEntrySdrObject::~SdrDragEntrySdrObject()
}
}
-drawinglayer::primitive2d::Primitive2DSequence
SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod
rDragMethod)
+void SdrDragEntrySdrObject::prepareCurrentState(SdrDragMethod rDragMethod)
{
// for the moment, i need to re-create the clone in all cases. I need to
figure
// out when clone and original have the same class, so that i can use
operator=
// in those cases
-const SdrObject* pSource = maOriginal;
-
if(mpClone)
{
SdrObject::Free(mpClone);
@@ -165,7 +164,15 @@ drawinglayer::primitive2d::Primitive2DSequence
SdrDragEntrySdrObject::createPrim
// apply original transformation, implemented at the DragMethods
rDragMethod.applyCurrentTransformationToSdrObject(*mpClone);
+}
+}
+drawinglayer::primitive2d::Primitive2DSequence
SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod
rDragMethod)
+{
+const SdrObject* pSource = maOriginal;
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
l10ntools/inc/cfgmerge.hxx |3 --
l10ntools/inc/export.hxx |2 -
l10ntools/inc/helpmerge.hxx|2 -
l10ntools/inc/lngmerge.hxx |2 -
l10ntools/source/cfgmerge.cxx | 24 +
l10ntools/source/export.cxx| 55 -
l10ntools/source/helpex.cxx|2 -
l10ntools/source/helpmerge.cxx | 39 +++--
l10ntools/source/lngex.cxx |2 -
l10ntools/source/lngmerge.cxx | 22
l10ntools/source/localize.cxx |1
l10ntools/source/uimerge.cxx |8 -
l10ntools/source/xrmmerge.cxx | 17 +++-
13 files changed, 63 insertions(+), 116 deletions(-)
New commits:
commit 4146406205ce6f939944685e1931dcd45f3de708
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 07:21:07 2013 +0200
l10ntools: export use only en-US
So no need to ad it in a commandline parameter.
No need to use a vector to store languages.
Change-Id: I1f7d3bd131b5a9ff23d403cee4ac6804ae8e0a0b
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index c34ba06..00838de 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -160,8 +160,7 @@ protected:
public:
CfgExport(
const OString rOutputFile,
-const OString rFilePath,
-const OString rLanguage
+const OString rFilePath
);
~CfgExport();
};
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 10223cd..719102d 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -243,7 +243,7 @@ private:
void CutComment( OString rText );
public:
-Export(const OString rOutput, const OString rLanguage);
+Export( const OString rOutput );
Export(const OString rMergeSource, const OString rOutput, const OString
rLanguage);
~Export();
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 95aad6d..1f9c90a 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -43,7 +43,7 @@ public:
/// Method append a PO file with the content of a parsed XML file
/// @PRECOND rHelpFile is valid
-static bool CreatePO( const OString rPOFile_in, const OString sHelpFile,
const OString rLanguage,
+static bool CreatePO( const OString rPOFile_in, const OString sHelpFile,
XMLFile *pXmlFile, const OString rGsi1 );
/// Method merges the String from the POfile into XMLfile. Both Strings must
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 8441824..0f98eac 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -53,7 +53,7 @@ public:
sal_Bool bULFFormat);
~LngParser();
-sal_Bool CreatePO( const OString rPOFile, const OString rLanguage );
+sal_Bool CreatePO( const OString rPOFile );
sal_Bool Merge(const OString rPOFile, const OString rDestinationFile,
const OString rLanguage );
};
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index dcbcfb9..d6a72ed 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -72,7 +72,7 @@ FILE * init(int argc, char ** argv) {
} else {
global::parser.reset(
new CfgExport(
-aArgs.m_sOutputFile, global::inputPathname, aArgs.m_sLanguage
));
+aArgs.m_sOutputFile, global::inputPathname ));
}
return pFile;
@@ -359,8 +359,7 @@ void CfgParser::Error(const OString rError)
/*/
CfgExport::CfgExport(
const OString rOutputFile,
-const OString rFilePath,
-const OString rLanguage
+const OString rFilePath
)
/*/
: sPath( rFilePath )
@@ -371,7 +370,6 @@ CfgExport::CfgExport(
std::cerr ERROR: Unable to open output file: rOutputFile
\n;
std::exit(EXIT_FAILURE);
}
-aLanguages.push_back( rLanguage );
}
/*/
@@ -388,7 +386,6 @@ void CfgExport::WorkOnResourceEnd()
if ( bLocalize ) {
if (
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(en-US))].getLength() )
{
-OString sFallback =
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(en-US))];
OString sXComment =
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(x-comment))];
OString sLocalId = pStackData-sIdentifier;
OString sGroupId;
@@ -400,20 +397,13 @@ void CfgExport::WorkOnResourceEnd()
sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
}
-for (size_t n = 0; n aLanguages.size(); n++)
-{
-OString sCur = aLanguages[ n ];
-
-OString sText = pStackData-sText[ sCur ];
-if
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3c/a8c0e04015fcd945a66e254d845dc9081aa5e5 f8/721f5f94f74522eae36dc6dc054b983384fac9
3c/a8c0e04015fcd945a66e254d845dc9081aa5e5 |1 + f8/721f5f94f74522eae36dc6dc054b983384fac9 |1 + 2 files changed, 2 insertions(+) New commits: commit e453377dda129c70da91850c7f8db0728d63386c Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:05:33 2013 +0100 Notes added by 'git notes add' diff --git a/3c/a8c0e04015fcd945a66e254d845dc9081aa5e5 b/3c/a8c0e04015fcd945a66e254d845dc9081aa5e5 new file mode 100644 index 000..7e9bd17 --- /dev/null +++ b/3c/a8c0e04015fcd945a66e254d845dc9081aa5e5 @@ -0,0 +1 @@ +merged as: c1a2f580f0a5a479282cfa7ffa538de6d30b216a commit 8e21089b680a6b3c991ad2408d9b3111dd5cacd2 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:05:26 2013 +0100 Notes added by 'git notes add' diff --git a/f8/721f5f94f74522eae36dc6dc054b983384fac9 b/f8/721f5f94f74522eae36dc6dc054b983384fac9 new file mode 100644 index 000..7e9bd17 --- /dev/null +++ b/f8/721f5f94f74522eae36dc6dc054b983384fac9 @@ -0,0 +1 @@ +merged as: c1a2f580f0a5a479282cfa7ffa538de6d30b216a ___ 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' - 52/55f9f08d68f4d8702f026dc1d2a840de62d627
52/55f9f08d68f4d8702f026dc1d2a840de62d627 |1 + 1 file changed, 1 insertion(+) New commits: commit 0eb33fb288fadbf33ca4b1dec7348ee90146d184 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:07:34 2013 +0100 Notes added by 'git notes add' diff --git a/52/55f9f08d68f4d8702f026dc1d2a840de62d627 b/52/55f9f08d68f4d8702f026dc1d2a840de62d627 new file mode 100644 index 000..33ab4d1 --- /dev/null +++ b/52/55f9f08d68f4d8702f026dc1d2a840de62d627 @@ -0,0 +1 @@ +prefer: b5e6d0a679ec3f80cae781c93fe7d728dd53b58e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svddrgmt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 72b60cf0380ee86908ca9804148cc41a8fa174b7
Author: Caolán McNamara caol...@redhat.com
Date: Sat Apr 13 08:13:10 2013 +0100
WaE: unused param
Change-Id: I29d6b8b19a677ecbd4b47fb80574e8b327a16d13
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index bd0aaac..8fdc6b8 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -167,7 +167,7 @@ void
SdrDragEntrySdrObject::prepareCurrentState(SdrDragMethod rDragMethod)
}
}
-drawinglayer::primitive2d::Primitive2DSequence
SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod
rDragMethod)
+drawinglayer::primitive2d::Primitive2DSequence
SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod)
{
const SdrObject* pSource = maOriginal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdoedge.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b724a3bde9462ab4232da507680bb0f2a6d5d597
Author: Caolán McNamara caol...@redhat.com
Date: Sat Apr 13 08:15:46 2013 +0100
WaE: unused param
Change-Id: Ie066849a312059e9dc2599e73258c57e9ceeda28
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index b2f427b..617ea43 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2256,7 +2256,7 @@ void SdrEdgeObj::NbcResize(const Point rRefPnt, const
Fraction aXFact, const F
}
// #i54102# added rotation support
-void SdrEdgeObj::NbcRotate(const Point rRef, long nWink, double sn, double cs)
+void SdrEdgeObj::NbcRotate(const Point rRef, long /*nWink*/, double sn,
double cs)
{
// handle start and end point if not connected
bool bCon1=aCon1.pObj!=NULL aCon1.pObj-GetPage()==pPage;
@@ -2298,7 +2298,7 @@ void SdrEdgeObj::NbcMirror(const Point rRef1, const
Point rRef2)
}
// #i54102# added shear support
-void SdrEdgeObj::NbcShear(const Point rRef, long nWink, double tn, bool
bVShear)
+void SdrEdgeObj::NbcShear(const Point rRef, long /*nWink*/, double tn, bool
bVShear)
{
// handle start and end point if not connected
bool bCon1=aCon1.pObj!=NULL aCon1.pObj-GetPage()==pPage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build failure on master in libcurl on Linux 32bit (Mint Nadia)
Hi all, Anyone else getting the following : libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-file.lo -MD -MP -MF .deps/libcurl_la-file.Tpo -c file.c -fPIC -DPIC -o .libs/libcurl_la-file.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-timeval.lo -MD -MP -MF .deps/libcurl_la-timeval.Tpo -c timeval.c -fPIC -DPIC -o .libs/libcurl_la-timeval.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-base64.lo -MD -MP -MF .deps/libcurl_la-base64.Tpo -c base64.c -fPIC -DPIC -o .libs/libcurl_la-base64.o In file included from base64.c:30:0: urldata.h:119:18: fatal error: nspr.h: No such file or directory compilation terminated. make[3]: *** [libcurl_la-base64.lo] Erreur 1 make[2]: *** [all] Erreur 2 make[1]: *** [/home/Development/libo/core/workdir/unxlngi6.pro/ExternalProject/curl/build] Erreur 1 make[1]: *** Attente des tâches non terminées make: *** [build] Erreur 2 This was after a fresh pull, make clean, make yesterday. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Calc Sort: Introducing new method AddKeyItem to avoid code d...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3370
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3370/1
Calc Sort: Introducing new method AddKeyItem to avoid code duplication
Change-Id: Ic34b5958472a7d2c19ff686914309b6699e237c4
---
M sc/source/ui/dbgui/sortkeydlg.cxx
M sc/source/ui/dbgui/tpsort.cxx
M sc/source/ui/inc/sortkeydlg.hxx
M sc/source/ui/inc/tpsort.hxx
4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 006dad5..3e09076 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -156,11 +156,12 @@
// ---
-void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem )
+void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItemIndex )
{
-m_rVertScroll.SetRangeMax( nItem );
-m_rVertScroll.DoScroll( nItem );
-m_aSortWin.AddSortKey( nItem );
+++nItemIndex;
+m_rVertScroll.SetRangeMax( nItemIndex );
+m_rVertScroll.DoScroll( nItemIndex );
+m_aSortWin.AddSortKey( nItemIndex );
checkAutoVScroll();
}
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6731e71..f153cf7 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -141,10 +141,7 @@
// Create three sort key dialogs by default
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
-{
-maSortKeyCtrl.AddSortKey(i+1);
-maSortKeyItems[i].m_pLbSort-SetSelectHdl( LINK( this,
ScTabPageSortFields, SelectHdl ) );
-}
+AddSortKeyItem(i);
}
// ---
@@ -170,11 +167,8 @@
{
// Make sure that the all sort keys are reset
for ( sal_uInt16 i=nSortKeyCount; iaSortData.maKeyState.size(); i++ )
-{
-maSortKeyCtrl.AddSortKey(i+1);
-maSortKeyItems[i].m_pLbSort-SetSelectHdl( LINK( this,
- ScTabPageSortFields, SelectHdl ) );
-}
+AddSortKeyItem(i);
+
nSortKeyCount = aSortData.maKeyState.size();
FillFieldLists(0);
@@ -443,6 +437,15 @@
return nFieldPos;
}
+//
+
+void ScTabPageSortFields::AddSortKeyItem( sal_uInt16 nItemIndex )
+{
+maSortKeyCtrl.AddSortKey( nItemIndex );
+maSortKeyItems[nItemIndex].m_pLbSort-SetSelectHdl(
+LINK( this, ScTabPageSortFields, SelectHdl ) );
+}
+
// ---
// Handler:
//-
@@ -463,9 +466,7 @@
// Add Sort Key Item
++nSortKeyCount;
-maSortKeyCtrl.AddSortKey( nSortKeyCount );
-maSortKeyItems[nSortKeyIndex].m_pLbSort-SetSelectHdl( LINK( this,
ScTabPageSortFields, SelectHdl ) );
-
+AddSortKeyItem( nSortKeyIndex );
FillFieldLists( nSortKeyIndex );
// Set Status
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index 060e8ad..7718663 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -99,7 +99,7 @@
public:
ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems mrSortKeyItems);
void setScrollRange();
-void AddSortKey( sal_uInt16 nItem );
+void AddSortKey( sal_uInt16 nItemIndex );
};
#endif // SC_SORTKEYDLG_HXX
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 8ce4a42..e4d82c6 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -95,6 +95,7 @@
voidInit();
voidFillFieldLists ( sal_uInt16 nStartField );
sal_uInt16 GetFieldSelPos ( SCCOLROW nField );
+voidAddSortKeyItem( sal_uInt16 nItemIndex );
// Handler
DECL_LINK( SelectHdl, ListBox * );
--
To view, visit https://gerrit.libreoffice.org/3370
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic34b5958472a7d2c19ff686914309b6699e237c4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: running soffice fails due to missing libjvmfwk.so.3 on master
Thanks, Ngo. That did the trick ;) Thomas On 12.04.2013 20:28, Cao Cuong Ngo wrote: Hi, I did 'make clean' and that did the trick ;) Cheers, CC Ngo. On 04/12/2013 07:36 PM, Thomas Arnhold wrote: Hi, with the latest master I can't run soffice: [thomas@localhost libo]$ /home/thomas/libo/install/program/soffice /home/thomas/libo/solver/unxlngi6/installation/opt/program/../ure-link/bin/javaldx: error while loading shared libraries: libjvmfwk.so.3: cannot open shared object file: No such file or directory Warning: failed to read path from javaldx /home/thomas/libo/solver/unxlngi6/installation/opt/program/soffice.bin: error while loading shared libraries: libreg.so.3: cannot open shared object file: No such file or directory Exited with code '127' [thomas@localhost libo]$ find . -name libjvmfwk* ./workdir/unxlngi6/LinkTarget/Library/libjvmfwk.so.objectlist ./workdir/unxlngi6/LinkTarget/Library/libjvmfwk.so ./workdir/unxlngi6/LinkTarget/Library/libjvmfwk.so.3 ./workdir/unxlngi6/Dep/LinkTarget/Library/libjvmfwk.so.d ./workdir/unxlngi6/Headers/Library/libjvmfwk.so ./workdir/unxlngi6/ExternalHeaders/Library/libjvmfwk.so ./solver/unxlngi6/lib/libjvmfwk.so ./solver/unxlngi6/lib/libjvmfwk.so.3 ./solver/unxlngi6/installation/opt/ure/lib/libjvmfwk.so Seems libjvmfwk.so.3 and libreg.so.3 didn't get installed. So I copied them manually to ./solver/unxlngi6/installation/opt/ure/lib/. This solved it for these files, but with the next run: [thomas@localhost libo]$ /home/thomas/libo/install/program/soffice /home/thomas/libo/solver/unxlngi6/installation/opt/program/../ure-link/bin/javaldx: error while loading shared libraries: libstore.so.3: cannot open shared object file: No such file or directory Warning: failed to read path from javaldx /home/thomas/libo/solver/unxlngi6/installation/opt/program/soffice.bin: error while loading shared libraries: libjvmaccess.so.3: cannot open shared object file: No such file or directory Exited with code '127' At all I had to copy libjvmfwk.so.3 libreg.so.3 libreg.so.3 libjvmfwk.so.3 I build with ./autogen.sh --enable-dbgutil Anybody knows what to fix here? :) Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e6/1611f607c1e10149a2eab69f4f223e3ae6b831
e6/1611f607c1e10149a2eab69f4f223e3ae6b831 |1 + 1 file changed, 1 insertion(+) New commits: commit 09c475625ae851930b43cdf9eada0c9d5b52fac5 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:45:33 2013 +0100 Notes added by 'git notes add' diff --git a/e6/1611f607c1e10149a2eab69f4f223e3ae6b831 b/e6/1611f607c1e10149a2eab69f4f223e3ae6b831 new file mode 100644 index 000..30ae6e0 --- /dev/null +++ b/e6/1611f607c1e10149a2eab69f4f223e3ae6b831 @@ -0,0 +1 @@ +prefer: 4c3501cb61147304252e2ac281d3e466b6af93d9 ___ 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' - 87/6efd1552d36cfc69e20c840cf4419320bfc854
87/6efd1552d36cfc69e20c840cf4419320bfc854 |1 + 1 file changed, 1 insertion(+) New commits: commit eaf5acd5a332271e5e4d3a78aad4fdbcdbb395bc Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:47:28 2013 +0100 Notes added by 'git notes add' diff --git a/87/6efd1552d36cfc69e20c840cf4419320bfc854 b/87/6efd1552d36cfc69e20c840cf4419320bfc854 new file mode 100644 index 000..f5b7874 --- /dev/null +++ b/87/6efd1552d36cfc69e20c840cf4419320bfc854 @@ -0,0 +1 @@ +prefer: 89f08dce89adfddd3fb8e00b7a7a9c5da2a4943e ___ 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' - 68/cf4bfa2770a8a8d6b78221bb9f1b699219b833
68/cf4bfa2770a8a8d6b78221bb9f1b699219b833 |1 + 1 file changed, 1 insertion(+) New commits: commit ced7c213f8b533c5c6e1d5ccf6e965a5370a2cba Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:49:01 2013 +0100 Notes added by 'git notes add' diff --git a/68/cf4bfa2770a8a8d6b78221bb9f1b699219b833 b/68/cf4bfa2770a8a8d6b78221bb9f1b699219b833 new file mode 100644 index 000..fe37860 --- /dev/null +++ b/68/cf4bfa2770a8a8d6b78221bb9f1b699219b833 @@ -0,0 +1 @@ +prefer: cea8b8375ea692bf243d5bb7debfebe9c7886c65 ___ 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' - 01/32f35e8be61d34156ef907adb7eb98902509da
01/32f35e8be61d34156ef907adb7eb98902509da |1 + 1 file changed, 1 insertion(+) New commits: commit 2a2f3ec8e1685176dea35e3c8fbc41ac4113511c Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:49:57 2013 +0100 Notes added by 'git notes add' diff --git a/01/32f35e8be61d34156ef907adb7eb98902509da b/01/32f35e8be61d34156ef907adb7eb98902509da new file mode 100644 index 000..af71407 --- /dev/null +++ b/01/32f35e8be61d34156ef907adb7eb98902509da @@ -0,0 +1 @@ +prefer: 6a94d7b5c924e3a8ef3ff0f68f54061c035a3cb0 ___ 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' - bc/3c9cee7217d79c4522ec0c19dd135fb4fb8418
bc/3c9cee7217d79c4522ec0c19dd135fb4fb8418 |1 + 1 file changed, 1 insertion(+) New commits: commit dac26ed5033b65f49540a296d4709fd46f5b4d10 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 08:56:14 2013 +0100 Notes added by 'git notes add' diff --git a/bc/3c9cee7217d79c4522ec0c19dd135fb4fb8418 b/bc/3c9cee7217d79c4522ec0c19dd135fb4fb8418 new file mode 100644 index 000..6461b88 --- /dev/null +++ b/bc/3c9cee7217d79c4522ec0c19dd135fb4fb8418 @@ -0,0 +1 @@ +prefer: 52ad6005d3350127234667384266ae7a368fe067 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx | 73 +-
1 file changed, 70 insertions(+), 3 deletions(-)
New commits:
commit fbc42f30bc0fbca4d12f34059f2b2b821921d849
Author: Zhe Wang wangz...@apache.org
Date: Wed Jun 20 05:54:57 2012 +
Resolves: #i119974# Ellipse shape too large in MS office ppt
(cherry picked from commit 1330e0eed32d5d6fee532a0538efada306822810)
Conflicts:
svx/source/customshapes/EnhancedCustomShape2d.cxx
Change-Id: If0b17bf110306b500cd7142a6a7fa4c343db68ff
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index b5d2d61..c37e17b 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1578,10 +1578,77 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16
rSrcPt, sal_uInt16 rSegm
for ( sal_uInt16 i = 0; ( i nPntCount ) ( ( rSrcPt +
2 ) nCoordSize ); i++ )
{
// create a circle
-Point _aCenter( GetPoint( seqCoordinates[ rSrcPt ],
true, true ) );
+Point _aCenter;
double fWidth, fHeight;
-GetParameter( fWidth, seqCoordinates[ rSrcPt + 1
].First, true, false );
-GetParameter( fHeight, seqCoordinates[ rSrcPt + 1
].Second, false, true );
+const mso_CustomShape* pDefCustomShape =
GetCustomShapeContent( mso_sptEllipse );
+bool bIsDefaultViewBox = false;
+bool bIsDefaultPath = false;
+bool bIsMSEllipse = false;
+
+if( ( nCoordWidth == pDefCustomShape-nCoordWidth )
+ ( nCoordHeight == pDefCustomShape-nCoordHeight
) )
+bIsDefaultViewBox = true;
+sal_Int32 j, nCount = pDefCustomShape-nVertices;//==3
+com::sun::star::uno::Sequence
com::sun::star::drawing::EnhancedCustomShapeParameterPair seqCoordinates1,
seqCoordinates2;
+
+seqCoordinates1.realloc( nCount );
+for ( j = 0; j nCount; j++ )
+{
+seqCoordinates1[j] = seqCoordinates[ rSrcPt + j];
+}
+
+seqCoordinates2.realloc( nCount );
+for ( j = 0; j nCount; j++ )
+{
+
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ j
].First, pDefCustomShape-pVertices[ j ].nValA );
+
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ j
].Second, pDefCustomShape-pVertices[ j ].nValB );
+}
+if(seqCoordinates1 == seqCoordinates2)
+bIsDefaultPath = true;
+
+const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM
( Type ) );
+rtl::OUString sShpType;
+SdrCustomShapeGeometryItem rGeometryItem =
(SdrCustomShapeGeometryItem)(const
SdrCustomShapeGeometryItem)pCustomShapeObj-GetMergedItem(
SDRATTR_CUSTOMSHAPE_GEOMETRY );
+Any* pAny = rGeometryItem.GetPropertyValueByName(
sType );
+if ( pAny )
+*pAny = sShpType;
+if( sShpType.getLength() 3
+sShpType.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(
mso ))){
+bIsMSEllipse = true;
+}
+if( (! bIsDefaultPath! bIsDefaultViewBox) ||
(bIsDefaultViewBox bIsMSEllipse) /* (nGeneratorVersion ==
SfxObjectShell::Sym_L2)*/ )
+{
+_aCenter = GetPoint( seqCoordinates[ rSrcPt ],
true, true );
+GetParameter( fWidth, seqCoordinates[ rSrcPt + 1
].First, true, false );
+GetParameter( fHeight, seqCoordinates[ rSrcPt + 1
].Second, false, true );
+fWidth /= 2;
+fHeight /= 2;
+}else if( bIsDefaultPath !bIsDefaultViewBox /*
(nGeneratorVersion == SfxObjectShell::Sym_L2)*/ )
+{
+_aCenter.X() = nCoordWidth/2 * fXScale;
+_aCenter.Y() = nCoordHeight/2 * fYScale;
+fWidth = nCoordWidth/2;
+fHeight = nCoordHeight/2;
+
+const rtl::OUString sViewBox(
RTL_CONSTASCII_USTRINGPARAM ( ViewBox ) );
+const Any* pViewBox =
((SdrCustomShapeGeometryItem)rGeometryItem).GetPropertyValueByName( sViewBox );
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 13/30e0eed32d5d6fee532a0538efada306822810
13/30e0eed32d5d6fee532a0538efada306822810 |1 + 1 file changed, 1 insertion(+) New commits: commit 1bbe9b6b6e10fd0abf60eed9430b27d927fb4526 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 09:03:58 2013 +0100 Notes added by 'git notes add' diff --git a/13/30e0eed32d5d6fee532a0538efada306822810 b/13/30e0eed32d5d6fee532a0538efada306822810 new file mode 100644 index 000..4d50392 --- /dev/null +++ b/13/30e0eed32d5d6fee532a0538efada306822810 @@ -0,0 +1 @@ +merged as: fbc42f30bc0fbca4d12f34059f2b2b821921d849 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/embedhlp.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 3c85fde4f96ae3ce550a4adb822f4a3c946c0178
Author: Armin Le Grand a...@apache.org
Date: Mon Aug 13 11:44:08 2012 +
Secure EmbeddedObjectRef::GetGraphic to react when something goes wrong
when trying to get the replacement graphic, better fallback to default ole
replacement graphic
(cherry picked from commit 9dc64b4255ed0f2eda0df3a3bbf59fa47202788c)
Conflicts:
svtools/source/misc/embedhlp.cxx
Change-Id: I31db9bf954cfca8f9c10163b03346c2b796ee0c8
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index e074a30..d4cbc53 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -439,11 +439,18 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
const Graphic* EmbeddedObjectRef::GetGraphic( OUString* pMediaType ) const
{
-if ( mpImpl-bNeedUpdate )
-// bNeedUpdate will be set to false while retrieving new replacement
-const_cast EmbeddedObjectRef* (this)-GetReplacement( true );
-else if ( !mpImpl-pGraphic )
-const_cast EmbeddedObjectRef* (this)-GetReplacement( false );
+try
+{
+if ( mpImpl-bNeedUpdate )
+// bNeedUpdate will be set to false while retrieving new
replacement
+const_cast EmbeddedObjectRef* (this)-GetReplacement(true);
+else if ( !mpImpl-pGraphic )
+const_cast EmbeddedObjectRef* (this)-GetReplacement(false);
+}
+catch( const uno::Exception ex )
+{
+SAL_WARN(svtools.misc, Something went wrong on getting the graphic:
ex.Message);
+}
if ( mpImpl-pGraphic pMediaType )
*pMediaType = mpImpl-aMediaType;
___
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' - 9d/c64b4255ed0f2eda0df3a3bbf59fa47202788c
9d/c64b4255ed0f2eda0df3a3bbf59fa47202788c |1 + 1 file changed, 1 insertion(+) New commits: commit 4100d1d6d1f9262f936a9205361e8852d9abb087 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 09:12:06 2013 +0100 Notes added by 'git notes add' diff --git a/9d/c64b4255ed0f2eda0df3a3bbf59fa47202788c b/9d/c64b4255ed0f2eda0df3a3bbf59fa47202788c new file mode 100644 index 000..afe761c --- /dev/null +++ b/9d/c64b4255ed0f2eda0df3a3bbf59fa47202788c @@ -0,0 +1 @@ +merged as: 3c85fde4f96ae3ce550a4adb822f4a3c946c0178 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx | 25 -
1 file changed, 16 insertions(+), 9 deletions(-)
New commits:
commit d7367b709dc4e97714fb2084b872a96389e768fb
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Sep 24 13:37:39 2012 +
Resolves: #i119634# mso shape import better shadow defaults
apply default shadow color, if none is given;
apply default shadow distance, if shadow type is not supported.
Patch by: Jianyuan Li
Review by: Oliver
(cherry picked from commit 19116761e7c6ebb2c2f9b76ab4c07fed2f9e8c77)
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: I99932ae3589cf2502db8d5901c5641d475becdcf
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index a4bb266..969d300 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2586,17 +2586,13 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
rSet.Put( SvxCrossedOutItem( nFontAttributes 0x01 ? STRIKEOUT_SINGLE
: STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
if ( IsProperty( DFF_Prop_fillColor ) )
rSet.Put( XFillColorItem( OUString(), rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_fillColor ), DFF_Prop_fillColor ) ) );
-if ( IsProperty( DFF_Prop_shadowType ) )
-{
-MSO_ShadowType eShadowType = static_cast MSO_ShadowType (
GetPropertyValue( DFF_Prop_shadowType ) );
-if( eShadowType != mso_shadowOffset )
-{
-rSet.Put( SdrShadowXDistItem( 35 ) ); // 0,35 mm shadow distance
-rSet.Put( SdrShadowYDistItem( 35 ) );
-}
-}
if ( IsProperty( DFF_Prop_shadowColor ) )
rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
+else
+{
+//The default value for this property is 0x00808080
+rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor( 0x00808080,
DFF_Prop_shadowColor ) ) );
+}
if ( IsProperty( DFF_Prop_shadowOpacity ) )
rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x1 -
GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
if ( IsProperty( DFF_Prop_shadowOffsetX ) )
@@ -2622,6 +2618,17 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
rSet.Put( SdrShadowYDistItem( 35 ) );
}
}
+if ( IsProperty( DFF_Prop_shadowType ) )
+{
+MSO_ShadowType eShadowType = static_cast MSO_ShadowType (
GetPropertyValue( DFF_Prop_shadowType ) );
+if( eShadowType != mso_shadowOffset )
+{
+//0.12 == 173 twip == 302 100mm
+sal_uInt32 nDist = rManager.pSdrModel-GetScaleUnit() == MAP_TWIP
? 173: 302;
+rSet.Put( SdrShadowXDistItem( nDist ) );
+rSet.Put( SdrShadowYDistItem( nDist ) );
+}
+}
if ( bHasShadow )
{
// #160376# sj: activating shadow only if fill and or linestyle is used
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Converted Insert - Names - creat widget.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3371 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3371/1 Converted Insert - Names - creat widget. Change-Id: I32967859db63a064a9e46a14430c125643e2bfd5 --- A sc/uiconfig/scalc/ui/createnamesdialog.ui 1 file changed, 180 insertions(+), 0 deletions(-) diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui new file mode 100644 index 000..866521f --- /dev/null +++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui @@ -0,0 +1,180 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=createnames +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesCreate Names/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +property name=xalign0.5099046325684/property +property name=yalign0.5099046325684/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkCheckButton id=checkbutton1 +property name=label translatable=yes_Top row/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/lngmerge.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 8287da2fbc09882893642b7a6e3ca555b2b956b3
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 09:04:59 2013 +0200
KeyId do not contain special chars so ulfex can use it again
Change-Id: Icfb581ac2771df39c71ad12f94dba5d51f3c4ec5
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 27c7d5d..98049f5 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -247,8 +247,6 @@ sal_Bool LngParser::Merge(
{
OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT,
sLang, sal_True );
-if( sLang == qtz )
-sNewText = sNewText.copy(sNewText.indexOf(|)
+ 2);
if ( !sNewText.isEmpty()) {
OString *pLine = (*pLines)[ nPos ];
@@ -285,8 +283,6 @@ sal_Bool LngParser::Merge(
OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
-if( sCur == qtz )
-sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
if ( !sNewText.isEmpty() sCur != x-comment)
{
OString sLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xistyle.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit b1d3dcb406c9abbebb0fd0a4a036c45910ef1d62
Author: Herbert Dürr h...@apache.org
Date: Wed Oct 17 11:39:14 2012 +
Resolves: #i121215# fix the spreadsheet font family
Patch-by: Tan Li litan.t...@gmail.com
Review-by: h...@apache.org
(cherry picked from commit 3258f70090ffb706d7dcfb66b16b404d86f8cfbf)
Conflicts:
sc/source/filter/excel/xistyle.cxx
Change-Id: Id50781e163ac33d3cd1b670808824c7c9b8718d3
diff --git a/sc/source/filter/excel/xistyle.cxx
b/sc/source/filter/excel/xistyle.cxx
index 8dfbad4..8158652 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -307,8 +307,18 @@ void XclImpFont::FillToItemSet( SfxItemSet rItemSet,
XclFontItemType eType, boo
rtl_TextEncoding eTempTextEnc = (bEE (eFontEnc ==
GetTextEncoding())) ?
ScfTools::GetSystemTextEncoding() : eFontEnc;
-SvxFontItem aFontItem( maData.GetScFamily( GetTextEncoding() ),
maData.maName, EMPTY_STRING,
-PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT );
+//add corresponding pitch for FontFamily
+FontPitch ePitch = PITCH_DONTKNOW;
+FontFamily eFtFamily = maData.GetScFamily( GetTextEncoding() );
+switch( eFtFamily ) //refer
http://msdn.microsoft.com/en-us/library/aa246306(v=VS.60).aspx
+{
+case FAMILY_ROMAN: ePitch = PITCH_VARIABLE;
break;
+case FAMILY_SWISS: ePitch = PITCH_VARIABLE;
break;
+case FAMILY_MODERN: ePitch = PITCH_FIXED;
break;
+default:break;
+ }
+SvxFontItem aFontItem( eFtFamily , maData.maName, EMPTY_STRING,
ePitch, eTempTextEnc, ATTR_FONT );
+
// set only for valid script types
if( mbHasWstrn )
PUTITEM( aFontItem, ATTR_FONT, EE_CHAR_FONTINFO );
___
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' - 32/58f70090ffb706d7dcfb66b16b404d86f8cfbf
32/58f70090ffb706d7dcfb66b16b404d86f8cfbf |1 + 1 file changed, 1 insertion(+) New commits: commit 613b16539961fd74b51556d96e50346170dac6e3 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 09:54:09 2013 +0100 Notes added by 'git notes add' diff --git a/32/58f70090ffb706d7dcfb66b16b404d86f8cfbf b/32/58f70090ffb706d7dcfb66b16b404d86f8cfbf new file mode 100644 index 000..5c04f6d --- /dev/null +++ b/32/58f70090ffb706d7dcfb66b16b404d86f8cfbf @@ -0,0 +1 @@ +merged as: b1d3dcb406c9abbebb0fd0a4a036c45910ef1d62 ___ 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' - 2 commits - a5/18afd93d2ab613aa46b922251af4f194305ca3 c1/9a02af48e4251cd0ee7fc8ea3d96480e714411
a5/18afd93d2ab613aa46b922251af4f194305ca3 |1 + c1/9a02af48e4251cd0ee7fc8ea3d96480e714411 |1 + 2 files changed, 2 insertions(+) New commits: commit 3a09ff5ebd91e9c78ae7e775ab396cdd6768612f Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 09:54:52 2013 +0100 Notes added by 'git notes add' diff --git a/c1/9a02af48e4251cd0ee7fc8ea3d96480e714411 b/c1/9a02af48e4251cd0ee7fc8ea3d96480e714411 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/c1/9a02af48e4251cd0ee7fc8ea3d96480e714411 @@ -0,0 +1 @@ +ignore: aoo commit 058939854f0d2ce5822feb05ecdaac76bea6fac7 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 09:54:41 2013 +0100 Notes added by 'git notes add' diff --git a/a5/18afd93d2ab613aa46b922251af4f194305ca3 b/a5/18afd93d2ab613aa46b922251af4f194305ca3 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/a5/18afd93d2ab613aa46b922251af4f194305ca3 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/localize.cxx | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
New commits:
commit 336e04496fa06cef99351692d60b2618c969d787
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 09:23:16 2013 +0200
Some empty pot directories remained
Change-Id: I5aedd4595c3f676deaedddf80c3a96250015f2ed
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 8bdec41..cc1e1de 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -284,19 +284,6 @@ void handleFilesOfDir(
}
}
}
-//Remove empty pot directories
-OUString sPoPath =
-OStringToOUString(
-rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
-OUString sPoUrl;
-if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
-!= osl::FileBase::E_None)
-{
-cerr Error: Cannot convert pathname to URL in __FILE__ ,
in line __LINE__ \n
- OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()
\n;
-throw false; //TODO
-}
-osl::Directory::remove(sPoUrl);
}
bool includeProject(const OString rProject) {
@@ -444,6 +431,20 @@ void handleDirectory(
cerr Error: Cannot close directory\n;
throw false; //TODO
}
+
+//Remove empty pot directory
+OUString sPoPath =
+OStringToOUString(
+rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
+OUString sPoUrl;
+if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
+!= osl::FileBase::E_None)
+{
+cerr Error: Cannot convert pathname to URL in __FILE__ ,
in line __LINE__ \n
+ OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()
\n;
+throw false; //TODO
+}
+osl::Directory::remove(sPoUrl);
}
void handleProjects(char * sSourceRoot, char const * sDestRoot)
___
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' - 65/3a074eec69ffffb136c94f9ee0c33c544dd223
65/3a074eec69b136c94f9ee0c33c544dd223 |1 + 1 file changed, 1 insertion(+) New commits: commit be763b039db71c53f0506d2623b11cc12dd7541a Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 10:11:46 2013 +0100 Notes added by 'git notes add' diff --git a/65/3a074eec69b136c94f9ee0c33c544dd223 b/65/3a074eec69b136c94f9ee0c33c544dd223 new file mode 100644 index 000..102f01e --- /dev/null +++ b/65/3a074eec69b136c94f9ee0c33c544dd223 @@ -0,0 +1 @@ +prefer: 5861faa1b378074c389200e8adef467f5b3099c9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/cellsuno.cxx | 37 +++--
1 file changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 5c012ae5ebb21c65f2f854e55eff2dd637c2f8c8
Author: Armin Le Grand a...@apache.org
Date: Fri Jun 29 08:04:31 2012 +
Resolves: #i120105# Avoid MemoryLeak in ScTableSheetObj::PrintAreaUndo_Impl
by handling created ScPrintRageSaver objects more careful.
Found by: Chao Huang
Patch by: Chao Huang, alg
Review by: alg(cherry picked from commit
803b94a2391352ccef46a6f8fdcfa9dc748bb737)
Change-Id: I0523bb870ed6a4ee301722e6e80dc9ac497a7299
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 2d4a3bf..067e3f4 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7435,31 +7435,40 @@ void SAL_CALL ScTableSheetObj::copyRange( const
table::CellAddress aDestination
void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges )
{
// Umbrueche und Undo
-
ScDocShell* pDocSh = GetDocShell();
-if ( pDocSh )
+ScDocument* pDoc = pDocSh ? pDocSh-GetDocument() : 0;
+
+if(pDocSh pDoc)
{
-ScDocument* pDoc = pDocSh-GetDocument();
-sal_Bool bUndo(pDoc-IsUndoEnabled());
-SCTAB nTab = GetTab_Impl();
+const bool bUndo(pDoc-IsUndoEnabled());
+const SCTAB nTab(GetTab_Impl());
-ScPrintRangeSaver* pNewRanges = pDoc-CreatePrintRangeSaver();
-if (bUndo)
+if(bUndo)
{
pDocSh-GetUndoManager()-AddUndoAction(
-new ScUndoPrintRange( pDocSh, nTab, pOldRanges,
pNewRanges ) );
-}
+new ScUndoPrintRange(
+pDocSh,
+nTab,
+pOldRanges,
+pDoc-CreatePrintRangeSaver())); // create new ranges
-ScPrintFunc( pDocSh, pDocSh-GetPrinter(), nTab ).UpdatePages();
+// #i120105# ownership of old ranges has changed, mark as consumed
+pOldRanges = 0;
+}
+ScPrintFunc(pDocSh, pDocSh-GetPrinter(), nTab).UpdatePages();
SfxBindings* pBindings = pDocSh-GetViewBindings();
-if (pBindings)
-pBindings-Invalidate( SID_DELETE_PRINTAREA );
+
+if(pBindings)
+{
+pBindings-Invalidate(SID_DELETE_PRINTAREA);
+}
pDocSh-SetDocumentModified();
}
-else
-delete pOldRanges;
+
+// #i120105# pOldRanges not used, need to cleanup
+delete pOldRanges;
}
uno::Sequencetable::CellRangeAddress SAL_CALL
ScTableSheetObj::getPrintAreas()
___
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' - 80/3b94a2391352ccef46a6f8fdcfa9dc748bb737
80/3b94a2391352ccef46a6f8fdcfa9dc748bb737 |1 + 1 file changed, 1 insertion(+) New commits: commit 043a31f7a5e74144bbef16e06d9e14facfa28755 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 10:19:57 2013 +0100 Notes added by 'git notes add' diff --git a/80/3b94a2391352ccef46a6f8fdcfa9dc748bb737 b/80/3b94a2391352ccef46a6f8fdcfa9dc748bb737 new file mode 100644 index 000..a0bb112 --- /dev/null +++ b/80/3b94a2391352ccef46a6f8fdcfa9dc748bb737 @@ -0,0 +1 @@ +merged as: 5c012ae5ebb21c65f2f854e55eff2dd637c2f8c8 ___ 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/ww8par.cxx | 36
1 file changed, 16 insertions(+), 20 deletions(-)
New commits:
commit 4de8beed1c6dd77e379e460d359f79ea73b855f8
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 15:08:56 2012 +
Resolves: #i119953# Fixed crash on File-Insert.
Reported by: Yan Ji
Patch by: Oliver-Rainer Wittmann
Review by: Andre Fischer
(cherry picked from commit 66cef81342b38e23c6785c101fe204a9512f0646)
Conflicts:
sw/source/filter/ww8/ww8par.cxx
Change-Id: Ia014c0c3b9fb78caf8e1d40bd629eb685d40fdd3
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 6d890de..42c9765 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4580,31 +4580,27 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary
*pGloss, const SwPosition rPos)
if (!mbNewDoc)
{
-// in ein Dokument einfuegen ?
-// Da immer ganze Zeile eingelesen werden, muessen
-// evtl. Zeilen eingefuegt / aufgebrochen werden
-//
+// inserting into an existing document:
+// As only complete paragraphs are inserted, the current one
+// needs to be splitted - once or even twice.
const SwPosition* pPos = pPaM-GetPoint();
-SwTxtNode const*const pSttNd = pPos-nNode.GetNode().GetTxtNode();
-sal_uInt16 nCntPos = pPos-nContent.GetIndex();
+// split current paragraph to get new paragraph for the insertion
+rDoc.SplitNode( *pPos, false );
-// EinfuegePos nicht in leerer Zeile
-if (nCntPos pSttNd-GetTxt().getLength())
-rDoc.SplitNode( *pPos, false );// neue Zeile erzeugen
-
-if (pSttNd-GetTxt().getLength())
-{ // EinfuegePos nicht am Ende der Zeile
-rDoc.SplitNode( *pPos, false );// neue Zeile
-pPaM-Move( fnMoveBackward ); // gehe in leere Zeile
+// another split, if insertion position was not at the end of the
current paragraph.
+SwTxtNode const*const pTxtNd = pPos-nNode.GetNode().GetTxtNode();
+if ( pTxtNd-GetTxt().getLength() )
+{
+rDoc.SplitNode( *pPos, false );
+// move PaM back to the newly empty paragraph
+pPaM-Move( fnMoveBackward );
}
-// verhinder das Einlesen von Tabellen in Fussnoten / Tabellen
-sal_uLong nNd = pPos-nNode.GetIndex();
-bReadNoTbl = 0 != pSttNd-FindTableNode() ||
-( nNd rDoc.GetNodes().GetEndOfInserts().GetIndex()
-rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex()
- nNd );
+// suppress insertion of tables inside footnotes.
+const sal_uLong nNd = pPos-nNode.GetIndex();
+bReadNoTbl = ( nNd rDoc.GetNodes().GetEndOfInserts().GetIndex()
+ rDoc.GetNodes().GetEndOfInserts().StartOfSectionIndex()
nNd );
}
___
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' - 66/cef81342b38e23c6785c101fe204a9512f0646
66/cef81342b38e23c6785c101fe204a9512f0646 |1 + 1 file changed, 1 insertion(+) New commits: commit d71de8d40664ded48408f1cfb08518cef4e1b341 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 10:26:02 2013 +0100 Notes added by 'git notes add' diff --git a/66/cef81342b38e23c6785c101fe204a9512f0646 b/66/cef81342b38e23c6785c101fe204a9512f0646 new file mode 100644 index 000..c75d028 --- /dev/null +++ b/66/cef81342b38e23c6785c101fe204a9512f0646 @@ -0,0 +1 @@ +merged as: 4de8beed1c6dd77e379e460d359f79ea73b855f8 ___ 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' - 32/d3b71d134afd85daf01196cdd7a56332719487
32/d3b71d134afd85daf01196cdd7a56332719487 |1 + 1 file changed, 1 insertion(+) New commits: commit f3ff3f49ac8cf177b76d415c69b334cf1e3bcef8 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 10:30:59 2013 +0100 Notes added by 'git notes add' diff --git a/32/d3b71d134afd85daf01196cdd7a56332719487 b/32/d3b71d134afd85daf01196cdd7a56332719487 new file mode 100644 index 000..e3091cd --- /dev/null +++ b/32/d3b71d134afd85daf01196cdd7a56332719487 @@ -0,0 +1 @@ +prefer: 79af094f8a31d4f47fe3b2675035055523cb54ab ___ 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' - 26/e18c9551f4d768a76e29df94e4b759d4ca4c55
26/e18c9551f4d768a76e29df94e4b759d4ca4c55 |1 + 1 file changed, 1 insertion(+) New commits: commit 4b29e1c7ff67d64611f0baa2da91d15f919393fb Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 10:39:15 2013 +0100 Notes added by 'git notes add' diff --git a/26/e18c9551f4d768a76e29df94e4b759d4ca4c55 b/26/e18c9551f4d768a76e29df94e4b759d4ca4c55 new file mode 100644 index 000..b0a20f1 --- /dev/null +++ b/26/e18c9551f4d768a76e29df94e4b759d4ca4c55 @@ -0,0 +1 @@ +prefer: 6e67c03dc0225fc66343546b14e902b9d238b1a3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Master branch now requires liborcus 0.5.0 or higher.
Hi Kohei, On Sat, Apr 13, 2013 at 02:46:33AM -0400, Kohei Yoshida wrote: FYI, I've updated liborcus on the master branch just now. You now need liborcus 0.5.0 or higher in order to build. It took me 2 days just to integrate this piece, but I've ensured that it builds both on Linux and Windows. So hopefully no major build issues. You mentioned some trouble with the build system on Windows elsewhere and I assume it was about this one. Could you elaborate on that? Did the trouble stem from gbuild itself, from our use of cygwin or from MSVC particularities? BTW, this seems like a prime example benefitting from upload to gerrit, let someone schudule a test build on all platforms -- any reason you skipped that? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit ddbf7961ef0c33672ad27af6416a69c1180e62e8
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Aug 21 12:28:29 2012 +
i#119446# correct condition for fields containing '.' or '/'
See also: i#61075, i#89667, i#111684
Found by: Yan Ji
Patch by: zjchen
Review by: Oliver
(cherry picked from commit 2eeb8010f1afbe47b56387a5ba96db41ece13fcc)
Conflicts:
sw/source/filter/ww8/ww8par5.cxx
Change-Id: Ia53b599c01d1a4b46bd52eac8a933ac6c0605586
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 37229cc..e746d6e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1060,13 +1060,16 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
pStrm-Seek( nOldPos );
// field codes which contain '/' or '.' are not displayed in WinWord
+// skip if it is formula field or found space before. see #i119446,
#i119585.
+const xub_StrLen nDotPos = aStr.Search('.');
+const xub_StrLen nSlashPos = aStr.Search('/');
xub_StrLen nSpacePos = aStr.Search( ' ', 1 );
-if ( STRING_NOTFOUND == nSpacePos )
-nSpacePos = aStr.Len( );
-xub_StrLen nSearchPos = STRING_NOTFOUND;
-if ( !( aStr.EqualsAscii( =, 1, 1 ) ) (
-( ( nSearchPos = aStr.Search('.') ) != STRING_NOTFOUND
nSearchPos nSpacePos ) ||
-( ( nSearchPos = aStr.Search('/') ) != STRING_NOTFOUND
nSearchPos nSpacePos ) ) )
+if ( nSpacePos == STRING_NOTFOUND )
+nSpacePos = aStr.Len();
+
+if ( !( aStr.EqualsAscii( =, 1, 1 ) )
+((( nDotPos != STRING_NOTFOUND ) ( nDotPos nSpacePos )) ||
+(( nSlashPos != STRING_NOTFOUND ) ( nSlashPos nSpacePos
return aF.nLen;
else
{
___
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' - 2e/eb8010f1afbe47b56387a5ba96db41ece13fcc
2e/eb8010f1afbe47b56387a5ba96db41ece13fcc |1 + 1 file changed, 1 insertion(+) New commits: commit e992727a8018c24a34e6645b8504e33b455009b8 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 11:02:26 2013 +0100 Notes added by 'git notes add' diff --git a/2e/eb8010f1afbe47b56387a5ba96db41ece13fcc b/2e/eb8010f1afbe47b56387a5ba96db41ece13fcc new file mode 100644 index 000..dc40a02 --- /dev/null +++ b/2e/eb8010f1afbe47b56387a5ba96db41ece13fcc @@ -0,0 +1 @@ +merged as: ddbf7961ef0c33672ad27af6416a69c1180e62e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/lngmerge.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 1e53d3b87aef18db7bce0c3990cc1403d1932fe2
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Sat Apr 13 09:52:05 2013 +0200
Revert KeyId do not contain special chars so ulfex can use it again
This reverts commit 8287da2fbc09882893642b7a6e3ca555b2b956b3.
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 98049f5..27c7d5d 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -247,6 +247,8 @@ sal_Bool LngParser::Merge(
{
OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT,
sLang, sal_True );
+if( sLang == qtz )
+sNewText = sNewText.copy(sNewText.indexOf(|)
+ 2);
if ( !sNewText.isEmpty()) {
OString *pLine = (*pLines)[ nPos ];
@@ -283,6 +285,8 @@ sal_Bool LngParser::Merge(
OString sNewText;
pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
+if( sCur == qtz )
+sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
if ( !sNewText.isEmpty() sCur != x-comment)
{
OString sLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/fields/reffld.cxx | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 9f3fad8804bfcd03e514d0c725c6380a16fb8f5a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 11 20:57:49 2013 +0100
Resolves: fdo#48039 use same algorithm for assigning get/set replacement ids
i.e. use the same algorithm for assigning replacement ids for both get and
set
exp fields.
Otherwise, consider for ex.
1. fields exists with ids of 1 and 2 in master document
2. a field exists with id of 1 in subdocument and must be reassigned a new
id to not collide with the pre existing master ids
In get orig algorithm assigned first unused slot of master to subdocument
field
i.e. 0 unused in master, so subdocument:1 converted to master:0
In set orig algorithm sorted all used master slots and assigned largest
used id
plus 1 (therefore unused) to subdocument field i.e. largest id used in
master is
2, so subdocument:1 converted to master:3
so get can't find set and error's out with:
Error: Reference source not found
Change-Id: Ie8758dc22cf8dff079532284e57eeaf4a9bd
(cherry picked from commit 74d942fb2396a268adfcc915e75b8b32fae851dc)
Reviewed-on: https://gerrit.libreoffice.org/3346
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 806f055..8285416 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -994,14 +994,9 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc, bool
bField )
GetFieldIdsFromDoc( rDestDoc, aIds );
GetFieldIdsFromDoc( rDoc, aDstIds );
-// Define the mappings now
-sal_uInt16 nMaxDstId = -1;
-if ( !aIds.empty() )
-nMaxDstId = *aIds.rbegin();
-
-// Map all the src fields to their value + nMaxDstId
+// Map all the new src fields to the next available unused id
for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
-AddId( ++nMaxDstId, *pIt );
+AddId( GetFirstUnusedId(aIds), *pIt );
// Change the Sequence number of all the SetExp fields in the
destination document
SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
@@ -1024,9 +1019,9 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc, bool
bField )
bInit = true;
}
-/// Get the lowest unused ID in the passed set.
+/// Get the lowest number unused in the passed set.
/// @param[in] rIds The set of used ID numbers.
-/// @returns The lowest unused ID.
+/// @returns The lowest number unused by the passed set
sal_uInt16 _RefIdsMap::GetFirstUnusedId( std::setsal_uInt16 rIds )
{
sal_uInt16 num(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/source
sw/source/core/fields/reffld.cxx | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 1b1fe71be534fb05a11f741375e47f552e7a8914
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 11 20:57:49 2013 +0100
Resolves: fdo#48039 use same algorithm for assigning get/set replacement ids
i.e. use the same algorithm for assigning replacement ids for both get and
set
exp fields.
Otherwise, consider for ex.
1. fields exists with ids of 1 and 2 in master document
2. a field exists with id of 1 in subdocument and must be reassigned a new
id to not collide with the pre existing master ids
In get orig algorithm assigned first unused slot of master to subdocument
field
i.e. 0 unused in master, so subdocument:1 converted to master:0
In set orig algorithm sorted all used master slots and assigned largest
used id
plus 1 (therefore unused) to subdocument field i.e. largest id used in
master is
2, so subdocument:1 converted to master:3
so get can't find set and error's out with:
Error: Reference source not found
Change-Id: Ie8758dc22cf8dff079532284e57eeaf4a9bd
(cherry picked from commit 74d942fb2396a268adfcc915e75b8b32fae851dc)
Reviewed-on: https://gerrit.libreoffice.org/3347
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 79b076b..71b1902 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1007,14 +1007,9 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
GetFieldIdsFromDoc( rDestDoc, aIds );
GetFieldIdsFromDoc( rDoc, aDstIds );
-// Define the mappings now
-sal_uInt16 nMaxDstId = -1;
-if ( !aIds.empty() )
-nMaxDstId = *aIds.rbegin();
-
-// Map all the src fields to their value + nMaxDstId
+// Map all the new src fields to the next available unused id
for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
-AddId( ++nMaxDstId, *pIt );
+AddId( GetFirstUnusedId(aIds), *pIt );
// Change the Sequence number of all the SetExp fields in the
destination document
SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
@@ -1037,9 +1032,9 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
bInit = sal_True;
}
-/// Get the lowest unused ID in the passed set.
+/// Get the lowest number unused in the passed set.
/// @param[in] rIds The set of used ID numbers.
-/// @returns The lowest unused ID.
+/// @returns The lowest number unused by the passed set
sal_uInt16 _RefIdsMap::GetFirstUnusedId( std::setsal_uInt16 rIds )
{
sal_uInt16 num(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] Resolves: fdo#48039 use same algorithm for assigning get/set...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3346 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3346 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8758dc22cf8dff079532284e57eeaf4a9bd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] Resolves: fdo#48039 use same algorithm for assigning get/set...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3347 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3347 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8758dc22cf8dff079532284e57eeaf4a9bd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Master branch now requires liborcus 0.5.0 or higher.
Hi, I got somme issue with --with-system-zlib and your modifications : /bin/sh: 1: LIBS+=-lz: not found make[1]: *** [/home/arnaud/core/workdir/ unxlngx6.pro/ExternalProject/liborcus/build] Erreur 1 make[1]: *** Attente des tâches non terminées make: *** [build] Erreur 2 I'm trying to resolve it but not sure I can 2013/4/13 Bjoern Michaelsen bjoern.michael...@canonical.com Hi Kohei, On Sat, Apr 13, 2013 at 02:46:33AM -0400, Kohei Yoshida wrote: FYI, I've updated liborcus on the master branch just now. You now need liborcus 0.5.0 or higher in order to build. It took me 2 days just to integrate this piece, but I've ensured that it builds both on Linux and Windows. So hopefully no major build issues. You mentioned some trouble with the build system on Windows elsewhere and I assume it was about this one. Could you elaborate on that? Did the trouble stem from gbuild itself, from our use of cygwin or from MSVC particularities? BTW, this seems like a prime example benefitting from upload to gerrit, let someone schudule a test build on all platforms -- any reason you skipped that? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit fd6d42395a676ba4a408b53725c8e4f9edf421cd Author: Andres Gomez ago...@igalia.com Date: Tue Apr 9 18:05:16 2013 +0300 build: warn when configure with --with-tls=openssl When expliciting openssl as tls implementation to use, show a warning as there are still some pieces of code that may depend on NSS or GNUTLS. Change-Id: I2cfaaf09b5ad83837928f2648975db956b261c19 Reviewed-on: https://gerrit.libreoffice.org/3327 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/configure.ac b/configure.ac index 1d00ebb..494de05 100644 --- a/configure.ac +++ b/configure.ac @@ -8109,6 +8109,10 @@ if test -n $with_tls; then openssl) AC_DEFINE(USE_TLS_OPENSSL) TLS=OPENSSL + +# warn that OpenSSL has been selected but not all TLS code has this option +AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS]) +add_warning TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS ;; nss) AC_DEFINE(USE_TLS_NSS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac RepositoryExternal.mk
RepositoryExternal.mk |9 +++ config_host.mk.in |1 configure.ac | 60 +- 3 files changed, 55 insertions(+), 15 deletions(-) New commits: commit e3f607e766cea9a867c7ebff8bd568536ff67da1 Author: Andres Gomez ago...@igalia.com Date: Thu Apr 11 10:24:25 2013 +0300 build: new --disable-openssl flag Most of the components included in LibreOffice already support alternative TLS libraries (e.g. NSS, GnuTLS). Change-Id: If00c348046fdbc88156f3d89c25e874e7e9bd04c Reviewed-on: https://gerrit.libreoffice.org/3328 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1dcb377..d1fd649 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1187,6 +1187,14 @@ endef endif # SYSTEM_ICU +ifeq ($(DISABLE_OPENSSL),YES) + +gb_ExternalProject__use_openssl:= +gb_LinkTarget__use_openssl_headers:= +gb_LinkTarget__use_openssl:= + +else # !DISABLE_OPENSSL + ifeq ($(SYSTEM_OPENSSL),YES) gb_LinkTarget__use_openssl_headers:= @@ -1251,6 +1259,7 @@ endif endef endif # SYSTEM_OPENSSL +endif # DISABLE_OPENSSL ifeq ($(SYSTEM_CDR),YES) diff --git a/config_host.mk.in b/config_host.mk.in index ec1542a..d794d16 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -98,6 +98,7 @@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ export DISABLE_EXPORT=@DISABLE_EXPORT@ export DISABLE_LINKOO=@DISABLE_LINKOO@ export DISABLE_NEON=@DISABLE_NEON@ +export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@ export DLLTOOL=@DLLTOOL@ diff --git a/configure.ac b/configure.ac index 494de05..7c5169e 100644 --- a/configure.ac +++ b/configure.ac @@ -1170,6 +1170,13 @@ AC_ARG_ENABLE(bogus-pkg-config, [MACOSX only: on MacOSX pkg-config can cause trouble. by default if one is found in the PATH, an error is issued. This flag turn that error into a warning.]), ) +AC_ARG_ENABLE(openssl, +AS_HELP_STRING([--disable-openssl], +[Disable using libssl/libcrypto from OpenSSL. If disabled, + components will either use GNUTLS or NSS. Work in progress, + use only if you are hacking on it.]), +,enable_openssl=yes) + dnl === dnl Optional Packages (--with/without-) dnl === @@ -8110,6 +8117,10 @@ if test -n $with_tls; then AC_DEFINE(USE_TLS_OPENSSL) TLS=OPENSSL +if test $enable_openssl != yes; then +AC_MSG_ERROR([Disabling OpenSSL was requested, but the requested TLS to use is actually OpenSSL.]) +fi + # warn that OpenSSL has been selected but not all TLS code has this option AC_MSG_WARN([TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS]) add_warning TLS/SSL implementation to use is OpenSSL but some code may still be depending on NSS or GNUTLS @@ -8126,8 +8137,13 @@ nss - Mozilla's Network Security Services (NSS) ;; esac else -AC_DEFINE(USE_TLS_OPENSSL) -TLS=OPENSSL +if test $enable_openssl = yes; then +AC_DEFINE(USE_TLS_OPENSSL) +TLS=OPENSSL +else +AC_DEFINE(USE_TLS_NSS) +TLS=NSS +fi fi AC_MSG_RESULT([$TLS]) AC_SUBST(TLS) @@ -8526,22 +8542,36 @@ fi dnl === dnl Check for system openssl dnl === -if test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \ -$_os = DragonFly test $with_system_openssl != no; then -# Mac OS builds should get out without extra stuff is the Mac porters' -# wish. And pkg-config is although Xcode ships a .pc for openssl -with_system_openssl=yes -SYSTEM_OPENSSL=YES -OPENSSL_CFLAGS= -OPENSSL_LIBS=-lssl -lcrypto +DISABLE_OPENSSL=NO +AC_MSG_CHECKING([whether to disable OpenSSL usage]) +if test $enable_openssl = yes; then +AC_MSG_RESULT([no]) +if test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \ +$_os = DragonFly test $with_system_openssl != no; then +# Mac OS builds should get out without extra stuff is the Mac porters' +# wish. And pkg-config is although Xcode ships a .pc for openssl +with_system_openssl=yes +SYSTEM_OPENSSL=YES +OPENSSL_CFLAGS= +OPENSSL_LIBS=-lssl -lcrypto +else +libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) +fi +if test $with_system_openssl = yes; then +libo_MINGW_CHECK_DLL([SSL], [libssl]) +libo_MINGW_CHECK_DLL([CRYPTO], [libcrypto]) +fi else -libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) -fi -if test $with_system_openssl = yes; then -
[Libreoffice-commits] core.git: libxmlsec/ExternalPackage_xmlsec.mk libxmlsec/ExternalProject_xmlsec.mk
libxmlsec/ExternalPackage_xmlsec.mk |2 ++ libxmlsec/ExternalProject_xmlsec.mk |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit ef6f354bad86ac4a2e5a98777f5f9903dba90192 Author: Andres Gomez ago...@igalia.com Date: Tue Apr 9 18:08:05 2013 +0300 xmlsec: honor --disable-openssl and use NSS On --disable-openssl, let's avoid linking the bundled libxmlsec to OpenSSL by passing down --without-openssl to its configure script. Change-Id: I04447683adeba4b7059e94579adf43ef788a4916 Reviewed-on: https://gerrit.libreoffice.org/3329 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk index eebc541..a9fa070 100644 --- a/libxmlsec/ExternalPackage_xmlsec.mk +++ b/libxmlsec/ExternalPackage_xmlsec.mk @@ -25,7 +25,9 @@ $(eval $(call gb_ExternalPackage_add_file,xmlsec,bin/libxmlsec.dll,win32/binarie endif else ifeq ($(OS),ANDROID) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a)) +ifneq ($(DISABLE_OPENSSL),YES) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a)) +endif # DISABLE_OPENSSL else $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a)) $(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a)) diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 6535672..44d948b 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter MACOSX,$(OS)),ACLOCAL=aclocal -I $(SRCDIR)/m4/mac) autoreconf \ ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: python3/ExternalPackage_python3.mk python3/ExternalProject_python3.mk
python3/ExternalPackage_python3.mk |8 ++-- python3/ExternalProject_python3.mk |1 + 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 3aa14b5a2f8d815ada281b69e9b8600e759fc5de Author: Andres Gomez ago...@igalia.com Date: Wed Apr 10 11:20:42 2013 +0300 python: honor --disable-openssl On --disable-openssl, the bundled python library will not build its OpenSSL module. Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 Reviewed-on: https://gerrit.libreoffice.org/3332 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index fc16d5a..3dc4dfd 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -76,7 +76,9 @@ $(eval $(call gb_ExternalPackage_add_files,python3,lib/python/lib-dynload,\ LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + ) \ LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ @@ -95,7 +97,9 @@ $(eval $(call gb_ExternalPackage_add_files,python3,lib/python/lib-dynload,\ LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + ) \ LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 506551b..22a952c 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -79,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : ) \ CC=$(strip $(CC) \ $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ + $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac postgresql/ExternalProject_postgresql.mk
configure.ac |7 +++ postgresql/ExternalProject_postgresql.mk |9 + 2 files changed, 12 insertions(+), 4 deletions(-) New commits: commit f3f9db6d1d1fe63a4323f43de91a13aae03b1228 Author: Andres Gomez ago...@igalia.com Date: Wed Apr 10 11:22:05 2013 +0300 postgresql: honor --disable-openssl flag On --disable-openssl, let's avoid linking the bundled postgresql to OpenSSL by not passing down --with-openssl to its configure script. Also, configure stage will fail if krb5 or gssapi are enabled as they need OpenSSL and, in any case, --with-krb5 and --with-gssapi will not be passed down to postgresql configure script. Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46 Reviewed-on: https://gerrit.libreoffice.org/ Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/configure.ac b/configure.ac index 7c5169e..75e149f 100644 --- a/configure.ac +++ b/configure.ac @@ -7731,6 +7731,13 @@ dnl === if test x$enable_postgresql_sdbc != xno; then SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC +if test $with_krb5 = yes -a $enable_openssl = no; then +AC_MSG_ERROR([krb5 needs OpenSSL, but --disable-openssl was given.]) +fi +if test $with_gssapi = yes -a $enable_openssl = no; then +AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.]) +fi + AC_MSG_CHECKING([PostgreSQL C interface]) if test $with_system_postgresql = yes; then AC_MSG_RESULT([external PostgreSQL]) diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 19c10e3..63aa943 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -31,13 +31,14 @@ else $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ - --without-readline --disable-shared --with-openssl --with-ldap \ + --without-readline --disable-shared --with-ldap \ + $(if $(filter-out YES,$(DISABLE_OPENSSL)),--with-openssl) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter YES,$(WITH_KRB5)),--with-krb5) \ - $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \ + $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ + $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ CPPFLAGS=$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(filter NO,$(SYSTEM_OPENSSL)),\ + $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ -I$(call gb_UnpackedTarball_get_dir,openssl/include)) \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ LDFLAGS=-L$(OUTDIR)/lib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac m4/libgcrypt.m4 neon/configs neon/Library_neon.mk neon/neon_with_gnutls.patch neon/UnpackedTarball_neon.mk RepositoryExternal.mk
RepositoryExternal.mk| 34 +++ config_host.mk.in|4 + configure.ac | 15 + m4/libgcrypt.m4 | 123 +++ neon/Library_neon.mk | 15 + neon/UnpackedTarball_neon.mk |1 neon/configs/config.h| 14 +++- neon/neon_with_gnutls.patch | 29 ++ 8 files changed, 230 insertions(+), 5 deletions(-) New commits: commit 48d49759a4d43b5e5dd997b4a87555ce25ae2a04 Author: Andres Gomez ago...@igalia.com Date: Thu Apr 11 10:32:54 2013 +0300 neon: honor --disable-openssl and use GNUTLS On --disable-openssl, the bundled neon library will link against GNUTLS + gcrypt instead of OpenSSL. Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4 Reviewed-on: https://gerrit.libreoffice.org/3330 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d1fd649..6218a51 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1262,6 +1262,40 @@ endif # SYSTEM_OPENSSL endif # DISABLE_OPENSSL +ifeq ($(DISABLE_OPENSSL),YES) + +define gb_LinkTarget__use_gnutls +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(GNUTLS_CFLAGS) \ +) + +$(call gb_LinkTarget_add_defs,$(1),\ +-DDISABLE_OPENSSL \ +) + +$(call gb_LinkTarget_add_libs,$(1),$(GNUTLS_LIBS)) + +endef + +define gb_LinkTarget__use_libgcrypt +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBGCRYPT_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),$(LIBGCRYPT_LIBS)) + +endef + +else # !DISABLE_OPENSSL + +gb_LinkTarget__use_gnutls:= +gb_LinkTarget__use_libgcrypt:= + +endif # DISABLE_OPENSSL + + ifeq ($(SYSTEM_CDR),YES) define gb_LinkTarget__use_cdr diff --git a/config_host.mk.in b/config_host.mk.in index d794d16..a0f4675 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -182,6 +182,8 @@ export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@ +export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ +export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @x_GNUCP@ export GNUCOPY=@GNUCP@ export GNUMAKE=@GNUMAKE@ @@ -289,6 +291,8 @@ export LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@ export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@ export LIBFONTS_JAR=@LIBFONTS_JAR@ export LIBFORMULA_JAR=@LIBFORMULA_JAR@ +export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@ +export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ diff --git a/configure.ac b/configure.ac index 75e149f..da58c89 100644 --- a/configure.ac +++ b/configure.ac @@ -8580,6 +8580,21 @@ fi AC_SUBST([DISABLE_OPENSSL]) dnl === +dnl Check for building gnutls +dnl === +AC_MSG_CHECKING([whether to use gnutls]) +if test $enable_neon != no test $enable_openssl = no; then +AC_MSG_RESULT([yes]) +AM_PATH_LIBGCRYPT() +PKG_CHECK_MODULES(GNUTLS, [gnutls],, +AC_MSG_ERROR([Disabling OpenSSL was requested, but GNUTLS is not + available in the system to use as replacement.])) +fi + +AC_SUBST([LIBGCRYPT_CFLAGS]) +AC_SUBST([LIBGCRYPT_LIBS]) + +dnl === dnl Check for system redland dnl === dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base) diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 new file mode 100644 index 000..831dc0c --- /dev/null +++ b/m4/libgcrypt.m4 @@ -0,0 +1,123 @@ +dnl Autoconf macros for libgcrypt +dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. +dnl +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +dnl with the API version to also check the API compatibility. Example: +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +dnl version of libgcrypt is at least 1.2.5 *and* the API number
[PUSHED] build: warn when configure with --with-tls=openssl
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3327 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3327 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cfaaf09b5ad83837928f2648975db956b261c19 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] build: new --disable-openssl flag
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3328 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3328 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If00c348046fdbc88156f3d89c25e874e7e9bd04c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] xmlsec: honor --disable-openssl and use NSS
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3329 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3329 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04447683adeba4b7059e94579adf43ef788a4916 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] python: honor --disable-openssl
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3332 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3332 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] postgresql: honor --disable-openssl flag
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/ Approvals: LibreOffice gerrit bot: Verified David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/ To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] neon: honor --disable-openssl and use GNUTLS
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3330 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3330 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez ago...@igalia.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failure on master in libcurl on Linux 32bit (Mint Nadia)
Le 13/04/2013 09:22, Alex Thurgood a écrit : config.status: executing libtool commands configure: Configured to build curl/libcurl: curl version: 7.26.0 Host setup: i686-pc-linux-gnu Install prefix: /usr/local Compiler: /usr/bin/ccache gcc SSL support: enabled (NSS) SSH support: no (--with-libssh2) zlib support: enabled krb4 support: no (--with-krb4*) GSSAPI support: no (--with-gssapi) SPNEGO support: no (--with-spnego) TLS-SRP support: no (--enable-tls-srp) resolver: default (--enable-ares / --enable-threaded-resolver) ipv6 support: enabled IDN support: no (--with-libidn) Build libcurl:Shared=yes, Static=no Built-in manual: enabled --libcurl option: enabled (--disable-libcurl-option) Verbose errors: enabled (--disable-verbose) SSPI support: no (--enable-sspi) ca cert bundle: /etc/ssl/certs/ca-certificates.crt ca cert path: no LDAP support: no (--enable-ldap / --with-ldap-lib / --with-lber-lib) LDAPS support:no (--enable-ldaps) RTSP support: enabled RTMP support: no (--with-librtmp) Protocols:FTP FTPS HTTP HTTPS IMAP IMAPS POP3 POP3S RTSP SMTP SMTPS TFTP libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-file.lo -MD -MP -MF .deps/libcurl_la-file.Tpo -c file.c -fPIC -DPIC -o .libs/libcurl_la-file.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-timeval.lo -MD -MP -MF .deps/libcurl_la-timeval.Tpo -c timeval.c -fPIC -DPIC -o .libs/libcurl_la-timeval.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-base64.lo -MD -MP -MF .deps/libcurl_la-base64.Tpo -c base64.c -fPIC -DPIC -o .libs/libcurl_la-base64.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I../include/curl -I../include -I../include -I../lib -I../lib -DCURL_HIDDEN_SYMBOLS -fvisibility=hidden -g0 -O2 -Wno-system-headers -MT libcurl_la-hostip.lo -MD -MP -MF .deps/libcurl_la-hostip.Tpo -c hostip.c -fPIC -DPIC -o .libs/libcurl_la-hostip.o In file included from hostip.c:56:0: urldata.h:119:18: fatal error: nspr.h: No such file or directory compilation terminated. In file included from base64.c:30:0: urldata.h:119:18: fatal error: nspr.h: No such file or directory compilation terminated. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: configure.ac
configure.ac |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 8d5113bde40c05b722a14d257ae633fb30efd960 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Apr 13 13:16:03 2013 +0200 Check for more boost headers in prevision of spirit-based colour parser diff --git a/configure.ac b/configure.ac index 90e4bc1..892c265 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,11 @@ AC_SUBST(ICU_LIBS) # === AC_CHECK_HEADERS( - [boost/property_tree/ptree.hpp boost/property_tree/json_parser.hpp], + boost/algorithm/string.hpp \ + boost/optional.hpp \ + boost/property_tree/ptree.hpp \ + boost/spirit/include/classic.hpp \ + boost/property_tree/json_parser.hpp, [], [AC_MSG_ERROR(Required boost headers not found. Install boost = 1.41.0)], [] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/cfgmerge.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 41807e779f93cc3dc7cb338a13b19195a77d11af Author: Tor Lillqvist t...@iki.fi Date: Sat Apr 13 14:21:36 2013 +0300 Fix warning: unused variable 'sPlatform' [loplugin] Change-Id: I2d6c7bae4f202a00f89d22b63370c128cc27c7c4 diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index d6a72ed..e5923ab 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -475,8 +475,6 @@ void CfgMerge::WorkOnText(OString rText, const OString rLangIndex) sGroupId = aStack.GetAccessPath( aStack.size() - 2 ); } -OString sPlatform; - pResData = new ResData( sGroupId, sFilename ); pResData-sId = sLocalId; pResData-sResTyp = pStackData-sResTyp; ___ 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/docxattributeoutput.cxx | 13 ++---
sw/source/filter/ww8/docxattributeoutput.hxx |2 ++
sw/source/filter/ww8/rtfattributeoutput.cxx | 23 ---
sw/source/filter/ww8/rtfattributeoutput.hxx |4 ++--
4 files changed, 26 insertions(+), 16 deletions(-)
New commits:
commit 42e57f463ed46c64560e6b27a75cc1e9ad519743
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 13:34:20 2013 +0200
sw: fix frame size of textboxes in DOCX/RTF export
In case the frame is AutoSize and the nominal height is less than the
real height, we used to end up with textboxes having height small enough
that some of the content was unreadable.
Instead, do what the WW8 export does and relay on sw::Frame to provide
the layout size.
Change-Id: I2a6cf4373c8565eef780273745a6ef27ddc65753
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 86058dd..c988b39 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -304,6 +304,11 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
m_rExport.mpParentFrame = pParentFrame;
+// When a frame has some low height, but automatically expanded due
+// to lots of contents, this size contains the real size.
+const Size aSize = pParentFrame-GetSize();
+m_pFlyFrameSize = aSize;
+
m_bTextFrameSyntax = true;
m_pFlyAttrList = m_pSerializer-createAttrList( );
m_pTextboxAttrList = m_pSerializer-createAttrList();
@@ -315,6 +320,7 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
XFastAttributeListRef xTextboxAttrList(m_pTextboxAttrList);
m_pTextboxAttrList = NULL;
m_bTextFrameSyntax = false;
+m_pFlyFrameSize = 0;
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
m_pSerializer-startElementNS( XML_w, XML_pict, FSEND );
@@ -4282,10 +4288,10 @@ void DocxAttributeOutput::ParaSnapToGrid( const
SvxParaGridItem rGrid )
void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize rSize )
{
-if (m_bTextFrameSyntax)
+if (m_bTextFrameSyntax m_pFlyFrameSize)
{
-m_aTextFrameStyle.append(;width:).append(double(rSize.GetWidth()) /
20);
-
m_aTextFrameStyle.append(pt;height:).append(double(rSize.GetHeight()) /
20).append(pt);
+
m_aTextFrameStyle.append(;width:).append(double(m_pFlyFrameSize-Width()) /
20);
+
m_aTextFrameStyle.append(pt;height:).append(double(m_pFlyFrameSize-Height())
/ 20).append(pt);
}
else if ( m_rExport.bOutFlyFrmAttrs )
{
@@ -4845,6 +4851,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_pFlyAttrList( NULL ),
m_pFlyFillAttrList( NULL ),
m_pTextboxAttrList( NULL ),
+ m_pFlyFrameSize(0),
m_pFootnotesList( new ::docx::FootnotesList() ),
m_pEndnotesList( new ::docx::FootnotesList() ),
m_footnoteEndnoteRefTag( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index c044ad8..32d0a84 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -567,6 +567,8 @@ private:
::sax_fastparser::FastAttributeList *m_pFlyFillAttrList;
/// Attributes of the next v:textbox element.
::sax_fastparser::FastAttributeList *m_pTextboxAttrList;
+/// When exporting fly frames, this holds the real size of the frame.
+const Size* m_pFlyFrameSize;
::docx::FootnotesList *m_pFootnotesList;
::docx::FootnotesList *m_pEndnotesList;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2a463b0..2918e5d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1507,12 +1507,17 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const
sw::Frame rFrame, const Poi
// Shape properties.
m_aFlyProperties.push_back(std::make_pairOString,
OString(shapeType, OString::number(ESCHER_ShpInst_TextBox)));
+// When a frame has some low height, but automatically expanded due
+// to lots of contents, this size contains the real size.
+const Size aSize = rFrame.GetSize();
+m_pFlyFrameSize = aSize;
+
m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = true;
m_rExport.OutputFormat( rFrame.GetFrmFmt(), false, false, true );
m_rExport.Strm() m_aRunText.makeStringAndClear().getStr();
m_rExport.Strm() m_aStyles.makeStringAndClear().getStr();
m_rExport.bOutFlyFrmAttrs = m_rExport.bRTFFlySyntax = false;
-m_pFmtFrmSize = 0;
+m_pFlyFrameSize = 0;
for (size_t i = 0; i
Re: Master branch now requires liborcus 0.5.0 or higher.
On pc Debian x86-64 with master sources updated today (commit 42e57f463ed46c64560e6b27a75cc1e9ad519743), I've got the same problem as Arnaud. I did a make clean make dev-install. Here's my autogen.input: --with-system-odbc --enable-ext-barcode --enable-ext-diagram --enable-ext-google-docs --enable-ext-hunart --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-postgresql-sdbc --enable-ext-presenter-minimizer --enable-ext-typo --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher --enable-dbus --enable-graphite --enable-evolution2 --enable-werror --enable-debug --enable-dbgutil --enable-crashdump --enable-dependency-tracking --enable-online-update --enable-ext-mariadb-connector gcc (Debian 4.7.2-5) 4.7.2 GNU Make 3.82 Any idea? -- View this message in context: http://nabble.documentfoundation.org/Master-branch-now-requires-liborcus-0-5-0-or-higher-tp4049684p4049719.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dd/69d3e4e940a1835dc1b2f07762ec2379987930
dd/69d3e4e940a1835dc1b2f07762ec2379987930 |1 + 1 file changed, 1 insertion(+) New commits: commit ade47514bda25bebf36c7ac953825efbf65c Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 13 13:48:21 2013 +0100 Notes added by 'git notes add' diff --git a/dd/69d3e4e940a1835dc1b2f07762ec2379987930 b/dd/69d3e4e940a1835dc1b2f07762ec2379987930 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/dd/69d3e4e940a1835dc1b2f07762ec2379987930 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build Internal Error 512 ( tail_build ) on Ubuntu 12.04
Hello, i am using ubuntu 12.04 , 64 bit with intel i7 processor ( Dell sudio xps 1645 ) . Here is my autogen configure log . http://pastebin.com/pJ86y5wD I have cloned from git clone git://gerrit.libreoffice.org/core libo then make fetch $ ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0(Branch libreoffice-4-0) Build log : http://pastebin.com/SqY406sA Please check and guide me how to solve the error . Thanks . ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - reportbuilder/java
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
|3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit add46920608b6f5b79c0ca33845eae4e1e59a4b6
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:49:53 2013 +0200
work around fdo#62147
don't emit string-value attribute
Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8
Reviewed-on: https://gerrit.libreoffice.org/3311
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index 99ff3e5..ad303af 100644
---
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -189,7 +189,8 @@ public class FormatValueUtility
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, string);
}
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
+// work around fdo#62147
+//variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] work around fdo#62147
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3311 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3311 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - liborcus/ExternalProject_liborcus.mk liborcus/UnpackedTarball_orcus.mk
liborcus/ExternalProject_liborcus.mk | 41 --- liborcus/UnpackedTarball_orcus.mk|4 ++- 2 files changed, 36 insertions(+), 9 deletions(-) New commits: commit 173214d92046b4ea11f6c0959ca40999d1e0bbd2 Author: Tor Lillqvist t...@iki.fi Date: Sat Apr 13 16:22:16 2013 +0300 Fix liborcus build for Android Also hopefully make the environment variable setting on the configure commmand line saner and working as intended for all platforms where relevant. It doesn't work to set and append to an environment variable in one same command like CPPFLAGS=something CPPFLAGS+=more ./configure ... Change-Id: Ifb3fb6748d59388124b9987a1db3cab15ebaf757 diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index daded4d..d379280 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -60,16 +60,41 @@ else #$(if $(filter MSC,$(COM)),CPPFLAGS+=-DBOOST_ALL_NO_LIB) CXXFLAGS+=$(BOOST_CXXFLAGS)) +liborcus_LIBS= +ifeq ($(SYSTEM_ZLIB),YES) +liborcus_LIBS+=-lz +endif +ifeq ($(OS),ANDROID) +liborcus_LIBS+=-lgnustl_shared -lm +endif + +liborcus_CPPCLAGS=$(CPPFLAGS) +ifeq ($(COM),MSC) +liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB +endif +ifeq ($(SYSTEM_ZLIB),NO) +liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +endif +ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +endif +endif + +liborcus_CXXFLAGS=$(CXXFLAGS) +ifeq ($(COM),MSC) +liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) +endif +ifeq ($(SYSTEM_BOOST),NO) +liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost +endif + $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \ - $(if $(filter YES,$(SYSTEM_ZLIB)),LIBS+=-lz) \ - $(if $(filter MSC,$(COM)),CPPFLAGS+=-DBOOST_ALL_NO_LIB) \ - $(if $(filter MSC,$(COM)),CXXFLAGS+=$(BOOST_CXXFLAGS)) \ - $(if $(filter NO,$(SYSTEM_ZLIB)),CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost) \ - $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \ - $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS+=-D_GLIBCXX_DEBUG)) \ + $(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \ + $(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \ + $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \ + $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS='$(BOOST_LDFLAGS)') \ ./configure \ --with-pic \ --enable-static \ commit 6a46db8753e3376e8f7be3b2a9235c17e169e496 Author: Tor Lillqvist t...@iki.fi Date: Sat Apr 13 16:22:07 2013 +0300 The liborcus_0.1.0-configure.patch does apply and is needed Change-Id: I19340ff42c8edbe7b112569f12657757b466a244 diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index d09b3f4..4e91130 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/liborcus/UnpackedTarball_orcus.mk @@ -14,8 +14,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0)) orcus_patches := + # make config.sub recognize arm-linux-androideabi -# orcus_patches += liborcus_0.1.0-configure.patch - does not apply +orcus_patches += liborcus_0.1.0-configure.patch + # https://gitorious.org/orcus/orcus/merge_requests/2# # f60d6eecee72349993a392a9a63ddf3383d3b8c8- # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build Internal Error 512 ( tail_build ) on Ubuntu 12.04
Hello, i am using ubuntu 12.04 , 64 bit with intel i7 processor ( Dell sudio xps 1645 ) . Here is my autogen configure log . http://pastebin.com/pJ86y5wD I have cloned from git clone git://gerrit.libreoffice.org/core libo then make fetch $ ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0(Branch libreoffice-4-0) Build log : http://pastebin.com/SqY406sA Please check and guide me how to solve the error . Thanks . ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp | 40
1 file changed, 40 insertions(+)
New commits:
commit f114b46288a23b8cfb1300c89b372c9d8a3c709d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sat Apr 13 15:37:17 2013 +0200
Boost-based parser of CDR x6 colour string
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 5ffe7df..604a98c 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -34,6 +34,7 @@
#include set
#include boost/property_tree/json_parser.hpp
#include boost/property_tree/ptree.hpp
+#include boost/spirit/include/classic.hpp
#include libcdr_utils.h
#include CDRDocumentStructure.h
#include CDRInternalStream.h
@@ -128,6 +129,45 @@ static void processNameForEncoding(WPXString name,
unsigned short encoding)
return;
}
+int parseColourString(const char *colourString, libcdr::CDRColor colour,
double opacity)
+{
+ using namespace ::boost::spirit::classic;
+ bool bRes = false;
+
+ std::string colourModel;
+ unsigned val0, val1, val2, val3, val4;
+
+ if (colourString)
+ {
+bRes = parse(colourString,
+ // Begin grammar
+ (
+ (repeat_p(1, more)[alnum_p])[assign_a(colourModel)] (','
| eps_p)
+(repeat_p(1, more)[alnum_p]) (',' | eps_p)
+int_p[assign_a(val0)] (',' | eps_p)
+int_p[assign_a(val1)] (',' | eps_p)
+int_p[assign_a(val2)] (',' | eps_p)
+int_p[assign_a(val3)] (',' | eps_p)
+int_p[assign_a(val4)] (',' | eps_p)
+(repeat_p(8)[alnum_p] ('-')
repeat_p(3)[repeat_p(4)[alnum_p] ('-')] repeat_p(12)[alnum_p])
+ ) end_p,
+ // End grammar
+ space_p).full;
+ }
+
+ if( !bRes )
+return -1;
+
+ if (colourModel == CMYK)
+colour.m_colorModel = 2;
+ else if (colourModel == CMYK255)
+colour.m_colorModel = 3;
+ colour.m_colorValue = val0 | (val1 8) | (val2 16) | (val3 24);
+ opacity = (double)val4 / 100.0;
+
+ return 1;
+}
+
static void _readX6StyleString(WPXInputStream *input, unsigned length,
libcdr::CDRCharacterStyle style)
{
std::vectorunsigned char styleBuffer(length);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 9bfe5c0a570ca0a00110ca47553c0db21ae820d5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Apr 13 15:41:42 2013 +0200 No need to check for a header that is not included diff --git a/configure.ac b/configure.ac index 892c265..858118d 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,6 @@ AC_SUBST(ICU_LIBS) # === AC_CHECK_HEADERS( - boost/algorithm/string.hpp \ boost/optional.hpp \ boost/property_tree/ptree.hpp \ boost/spirit/include/classic.hpp \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source sw/source
i18npool/source/collator/collator_unicode.cxx |2 +-
sw/source/core/doc/doccomp.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ca9306c51789dbc8d7c893c5e79da3dc7492693e
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 15:48:12 2013 +0200
fdo#45941 algrithm - algorithm
Change-Id: I30fd0aa3ab337e62023d5adec9a0033b78959703
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 4e79908..40b5c47 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -136,7 +136,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
func=(const sal_uInt8* (*)())
osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData);
} else {
if ( rLocale.Language == ja ) {
-// replace algrithm name to implementation name.
+// replace algorithm name to implementation name.
if
(rAlgorithm.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(phonetic (alphanumeric
first))) )
aBuf.appendAscii(phonetic_alphanumeric_first);
else if
(rAlgorithm.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(phonetic (alphanumeric
last
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 676a937..fc896f3 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -284,7 +284,7 @@ public:
int nLcsLen, int nPieceLen );
};
-/// Use Hirschberg's algrithm to find LCS in linear space
+/// Use Hirschberg's algorithm to find LCS in linear space
class LgstCommonSubseq: public CommonSubseq
{
private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build Internal Error 512 ( tail_build ) on Ubuntu 12.04
Hi, On Sat, Apr 13, 2013 at 06:35:19PM +0530, Anurag Kanungo wrote: Hello, i am using ubuntu 12.04 , 64 bit with intel i7 processor ( Dell sudio xps 1645 ) . Here is my autogen configure log . http://pastebin.com/pJ86y5wD I have cloned from git clone git://gerrit.libreoffice.org/core libo then make fetch $ ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0(Branch libreoffice-4-0) Build log : http://pastebin.com/SqY406sA Please check and guide me how to solve the error . I would suggest not to use clang if this is your first build. _If_ you use clang, be prepared to do some work to keep it running now and then. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
gbuild: removing stale files from $OUTDIR and $INSTDIR
Hi all, I got an idea yesterday how to keep $OUTDIR (and $INSTDIR) free of stale files in incremental builds (this has mainly been problem with headers), by (ab)using the Deliver mechanism that is used for make showdeliverables, and knocked together an implementation of the idea. Obviously, removing anything from the output dirs during build is a bit risky (if a file is not properly registered by gb_Deliver_add_deliverable, it will be removed. I must note here that I have not found any problems with my configuration that builds practically everything.), so it needs careful testing. It can also have a performance impact. As I do not plan to continue to work on it in the near future (I have enough ideas for gbuild that are far less disruptive than this one :-), I am parking the patch there for reference. And if there is someone willing to do the necessary testing and profiling, even better :-) D. From 66ce3692bda24f9836b9e48b779954dfabd25d2f Mon Sep 17 00:00:00 2001 From: David Tardon dtar...@redhat.com Date: Sat, 13 Apr 2013 11:00:25 +0200 Subject: [PATCH] remove stale files from $(OUTDIR) during build Change-Id: I73ca65ba640f9b4d162a683f8111d90a101613b7 --- solenv/gbuild/Deliver.mk | 34 ++ solenv/gbuild/gbuild.mk | 4 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index de47b2b..2da4865 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -37,10 +37,41 @@ else gb_Deliver_CLEARONDELIVER := $(true) endif +gb_Deliver_TARGET := $(WORKDIR)/Deliver/cleanup +gb_Deliver_CLEANTARGET := $(WORKDIR)/Clean/Deliver/cleanup + +define gb_Deliver__command +$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DEL,1) +touch $(call var2file,$@.new,500,$(gb_Deliver_DELIVERABLES_OUTDIR)) \ +$(if $(wildcard $@),\ + tr ' ' \n $@.new | sort $@.new.list \ + tr ' ' \n $@ | sort $@.old.list \ + comm -23 $@.old.list $@.new.list | xargs rm -f \ + rm $@ $@.old.list $@.new.list \ +) \ +mv $@.new $@ +endef + +$(dir $(gb_Deliver_TARGET)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(gb_Deliver_TARGET) : $(BUILDDIR)/config_$(gb_Side).mk + $(call gb_Deliver__command,$@) + +.PHONY : $(gb_Deliver_CLEANTARGET) +$(gb_Deliver_CLEANTARGET) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(false),DEL,1) define gb_Deliver_init gb_Deliver_DELIVERABLES := gb_Deliver_DELIVERABLES_INDEX := +# Just a plain list of files, used to remove outdated files from +# output dirs. +gb_Deliver_DELIVERABLES_OUTDIR := + +$(gb_Deliver_TARGET) :| $(dir $(gb_Deliver_TARGET)).dir + +$$(eval $$(call gb_Module_register_target,$(gb_Deliver_TARGET),$(gb_Deliver_CLEANTARGET))) endef @@ -55,6 +86,9 @@ define gb_Deliver_add_deliverable $$(if $(3),,$$(error - missing third parameter for deliverable $(1))) ifeq ($(MAKECMDGOALS),showdeliverables) $(call gb_Deliver_register_deliverable,$(1),$(2),$(3)) +else +$(1) :| $(gb_Deliver_TARGET) +gb_Deliver_DELIVERABLES_OUTDIR += $(1) endif endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 87a5c65..f622602 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -278,8 +278,6 @@ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) include $(GBUILDDIR)/Deliver.mk -$(eval $(call gb_Deliver_init)) - # We are using a set of scopes that we might as well call classes. # It is important to include them in the right order as that is @@ -346,6 +344,8 @@ include $(foreach class, \ PackageSet \ ,$(GBUILDDIR)/$(class).mk) +$(eval $(call gb_Deliver_init)) + $(eval $(call gb_Helper_process_executable_registrations)) $(eval $(call gb_Postprocess_make_targets)) -- 1.8.1.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Internal Error 512 ( tail_build ) on Ubuntu 12.04
HI, I was trying to build as to solve the Easy Programming Task . Clean up warnings from the Clang compiler plugin https://wiki.documentfoundation.org/Easy_Hacks#Easy_Programming_tasks On Sat, Apr 13, 2013 at 7:21 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, On Sat, Apr 13, 2013 at 06:35:19PM +0530, Anurag Kanungo wrote: Hello, i am using ubuntu 12.04 , 64 bit with intel i7 processor ( Dell sudio xps 1645 ) . Here is my autogen configure log . http://pastebin.com/pJ86y5wD I have cloned from git clone git://gerrit.libreoffice.org/core libo then make fetch $ ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0(Branch libreoffice-4-0) Build log : http://pastebin.com/SqY406sA Please check and guide me how to solve the error . I would suggest not to use clang if this is your first build. _If_ you use clang, be prepared to do some work to keep it running now and then. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: liborcus/ExternalProject_liborcus.mk
liborcus/ExternalProject_liborcus.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c07874471ad529c129e834eff14968f097ce0c3 Author: Tor Lillqvist t...@iki.fi Date: Sat Apr 13 17:12:51 2013 +0300 Fix copy/paste error in 173214d92046b4ea11f6c0959ca40999d1e0bbd2 Change-Id: I47a3f6ef639c9103b8def0dd029fcb6efec4b085 diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index d379280..5d18234 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -77,7 +77,7 @@ liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib endif ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS))) ifneq (,$(gb_ENABLE_DBGUTIL)) -liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG endif endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 91 +-
1 file changed, 64 insertions(+), 27 deletions(-)
New commits:
commit 26114dcdf9d55a5a2490de6de619337e9733b0e2
Author: Eike Rathke er...@redhat.com
Date: Sat Apr 13 16:15:24 2013 +0200
resolved fdo#63421 crash in pivot table with accessibility
The scenario of fdo#63421 (loading data and re-dragging the same field)
is not needed, simple data is sufficient and crash happened also when
dragging (removing) a field from a pane and dropping it anywhere else.
Multiple errors:
* getAccessibleChildCount() must return the real current count of
children, not what mpFieldWindow says; AtkListener::updateChildList()
uses this value to repopulate its own list; a child is added after it
is added to mpFieldWindow but removed before it is removed from
mpFieldWindow;
* LostFocus() uses an index of -1 if the last child was already removed
and the field was dropped after dragging it away from a pane, handle
that but it still does not look right
* RemoveField() called CommitChange() with
AccessibleEventObject::NewValue set instead of OldValue, leading to
AtkListener::handleChildAdded() being called instead of
handleChildRemoved()
Apparently this never worked since 2002.
Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 6c71344..7aefcce 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -259,7 +259,7 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference XAccessibleContext (this);
-aEvent.NewValue = xTempAcc;
+aEvent.OldValue = xTempAcc;
CommitChange(aEvent); // gone child - event
@@ -270,25 +270,41 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
void ScAccessibleDataPilotControl::FieldFocusChange(sal_Int32 nOldIndex,
sal_Int32 nNewIndex)
{
-OSL_ENSURE(static_castsize_t(nOldIndex) maChildren.size()
-static_castsize_t(nNewIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nOldIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nOldIndex].pAcc)
-maChildren[nOldIndex].pAcc-ResetFocused();
+if (0 = nOldIndex static_castsize_t(nOldIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nOldIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nOldIndex].pAcc)
+maChildren[nOldIndex].pAcc-ResetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() old
index out of bounds: nOldIndex);
+}
-xTempAcc = maChildren[nNewIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nNewIndex].pAcc)
-maChildren[nNewIndex].pAcc-SetFocused();
+if (0 = nNewIndex static_castsize_t(nNewIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nNewIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nNewIndex].pAcc)
+maChildren[nNewIndex].pAcc-SetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() new
index out of bounds: nNewIndex);
+}
}
void ScAccessibleDataPilotControl::FieldNameChange(sal_Int32 nIndex)
{
-OSL_ENSURE(static_castsize_t(nIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-ChangeName();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-ChangeName();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldNameChange() index
out of bounds: nIndex);
+}
}
void ScAccessibleDataPilotControl::GotFocus()
@@ -298,9 +314,16 @@ void ScAccessibleDataPilotControl::GotFocus()
OSL_ENSURE(mpFieldWindow-GetFieldCount() == maChildren.size(), did
not recognize a child count change);
sal_Int32 nIndex(mpFieldWindow-GetSelectedField());
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-SetFocused();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit fb360f5f8a131383605bf301bb4d1e35dabaac65 Author: Rene Engelhard r...@debian.org Date: Sat Apr 13 16:17:29 2013 +0200 fix system-orcus: add dummy gb_LinkTarget__use_orcus-parser Change-Id: I6d2a73960ded37e60008daea6555001e7b126f5a diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6218a51..bcab2b9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2328,9 +2328,12 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(ORCUS_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS)) +endef + +define gb_LinkTarget__use_orcus-parser endef +$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS)) else # !SYSTEM_LIBORCUS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: 2 commits - ciabot/config.pl.sample ciabot/INSTALL ciabot/libreoffice-bugzilla.pl ciabot/libreoffice-ciabot.pl ciabot/projmap.json ciabot/README ciabot/run-libreof
ciabot/INSTALL |6
ciabot/README| 21 ++
ciabot/config.pl.sample | 11 +
ciabot/libreoffice-bugzilla.pl | 243
ciabot/libreoffice-ciabot.pl | 290 +++
ciabot/projmap.json |7
ciabot/run-libreoffice-ciabot.pl | 169 ++
ciabot/start-ciabot.sh |5
ciabot/start-irker.sh|7
irker-cia-proxy/projmap.json |7
10 files changed, 759 insertions(+), 7 deletions(-)
New commits:
commit c016e9de03ac9689874d208320d32049aeb47a17
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 16:22:55 2013 +0200
ciabot: add install instructions
Change-Id: Iefe25cf7d51cda4f2603cd4b64ad29b77a674212
diff --git a/ciabot/INSTALL b/ciabot/INSTALL
new file mode 100644
index 000..9684999
--- /dev/null
+++ b/ciabot/INSTALL
@@ -0,0 +1,6 @@
+The following steps are needed to use this code:
+
+- have this directory as ~/bin
+- git clone git://gitorious.org/irker/irker.git ~/bin/irker
+- git clone git://github.com/nenolod/irker-cia-proxy.git ~/bin/irker-cia-proxy
+- cd ~/bin/irker-cia-proxy; ln -s ../projmap.json
commit 3bee50d9f64bb91aaa7359c400d617a9ac9bb77f
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 16:19:09 2013 +0200
Import the irc / bugzilla notification code.
Authors:
23 Jan Holesovsky
10 Markus Mohrhard
9 Miklos Vajna
Change-Id: I946d7b85031b0f8ebb187737926174b592ba1610
diff --git a/ciabot/README b/ciabot/README
new file mode 100644
index 000..db6ce0d
--- /dev/null
+++ b/ciabot/README
@@ -0,0 +1,21 @@
+How the IRC nofication part works:
+
+1) After a reboot, start-irker.sh and start-ciabot.sh has to be started
+manually. The first starts irkerd, which -- in case of no errors -- has no
+output. The second starts run-libreoffice-ciabot.pl in screen.
+
+2) run-libreoffice-ciabot.pl invokes libreoffice-ciabot.pl for each commit,
which
+has an XML output, piped into irker-cia-proxy.py, which sends the info to
+irkerd.
+
+How to test the IRC notification part:
+
+1) Take the IRC bot offline, by editing ~/bin/irker-cia-proxy/projmap.json,
+e.g. redirect the channel from #libreoffice-dev to some test channel.
+
+2) Run:
+
+cd ~/libreoffice/core
+perl ~/bin/libreoffice-ciabot.pl core f9453275d2710f9d3e9a4cc1285a57db334a5e2e
| (cd ~/bin/irker-cia-proxy; python irker-cia-proxy.py -s)
+
+3) Once you're happy with the result, change projmap.json back.
diff --git a/ciabot/config.pl.sample b/ciabot/config.pl.sample
new file mode 100644
index 000..87f8edb
--- /dev/null
+++ b/ciabot/config.pl.sample
@@ -0,0 +1,11 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+# The bugzilla has contains the server, username and password for the targeted
+# bugzilla installation. There's NO 'http://' in the server line.
+our $bugzilla = {
+server = 'bugs.freedesktop.org/',
+user = 'libreoffice-comm...@lists.freedesktop.org',
+password = 'secret', # CHANGE THIS!
+};
diff --git a/ciabot/libreoffice-bugzilla.pl b/ciabot/libreoffice-bugzilla.pl
new file mode 100755
index 000..560b6bf
--- /dev/null
+++ b/ciabot/libreoffice-bugzilla.pl
@@ -0,0 +1,243 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+# A hook script which integrates with bugzilla. It looks for bug IDs in
+# commit messages and adds the commit message as well as a link to the
+# changeset as a comment on the bug.
+
+# This program is released under the terms of the GNU General Public License
+# version 2. A copy of the license may be obtained by emailing the author,
+# or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+#
+# The absolute lack of warranty and other disclaimers as per the license
+# apply.
+#
+# Copyright 2008, Devendra Gera. All rights reserved.
+#
+# Author : Devendra Gera
+
+### user configurable section
+
+our $bugzilla = {};
+
+do $ENV{'HOME'} . /bin/config.pl;
+
+# The bug_regex should extract the bug id from the commit message and place
+# it in $1
+my $bug_regex = 'fdo#(\d+)';
+
+# This contains the target version for all commits to master
+# Adjust it if a new version branch has been created
+my $master_target = '4.1.0';
+
+
+# End user configurable section
+
+use vars qw ($tree @parent $author $committer);
+use vars qw ($user $rev $logmsg);
+
+my $repo = $ARGV[0];
+my $sha= $ARGV[1];
+my $branch = $ARGV[2];
+
+use WWW::Bugzilla;
+
+my $cgiturl = http://cgit.freedesktop.org/libreoffice/$repo/commit/?id=$sha;;
+my $next_version = '';
+my $target_version = '';
+my $target = 'target:';
+
+if ( !defined( $branch ) || $branch eq '' )
+{
+$branch = master;
+$target .= $master_target;
+}
+else
+{
+$cgiturl .= h=$branch;
+
+# the fix will be available in the first version that branches from this
+if ( $branch =~ /libreoffice-([0-9]+)-([0-9]+)-([0-9]+)\b/ ) {
+$next_version = \nIt will be available already in LibreOffice
$1.$2.$3.;
+
[PATCH libreoffice-4-0] resolved fdo#63421 crash in pivot table with accessibility
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3372
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3372/1
resolved fdo#63421 crash in pivot table with accessibility
The scenario of fdo#63421 (loading data and re-dragging the same field)
is not needed, simple data is sufficient and crash happened also when
dragging (removing) a field from a pane and dropping it anywhere else.
Multiple errors:
* getAccessibleChildCount() must return the real current count of
children, not what mpFieldWindow says; AtkListener::updateChildList()
uses this value to repopulate its own list; a child is added after it
is added to mpFieldWindow but removed before it is removed from
mpFieldWindow;
* LostFocus() uses an index of -1 if the last child was already removed
and the field was dropped after dragging it away from a pane, handle
that but it still does not look right
* RemoveField() called CommitChange() with
AccessibleEventObject::NewValue set instead of OldValue, leading to
AtkListener::handleChildAdded() being called instead of
handleChildRemoved()
Apparently this never worked since 2002.
Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8
(cherry picked from commit 26114dcdf9d55a5a2490de6de619337e9733b0e2)
---
M sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
1 file changed, 64 insertions(+), 27 deletions(-)
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 035004ae..8490572 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -259,7 +259,7 @@
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference XAccessibleContext (this);
-aEvent.NewValue = xTempAcc;
+aEvent.OldValue = xTempAcc;
CommitChange(aEvent); // gone child - event
@@ -270,25 +270,41 @@
void ScAccessibleDataPilotControl::FieldFocusChange(sal_Int32 nOldIndex,
sal_Int32 nNewIndex)
{
-OSL_ENSURE(static_castsize_t(nOldIndex) maChildren.size()
-static_castsize_t(nNewIndex) maChildren.size(), did not
recognize a child count change);
+if (0 = nOldIndex static_castsize_t(nOldIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nOldIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nOldIndex].pAcc)
+maChildren[nOldIndex].pAcc-ResetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() old
index out of bounds: nOldIndex);
+}
-uno::Reference XAccessible xTempAcc = maChildren[nOldIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nOldIndex].pAcc)
-maChildren[nOldIndex].pAcc-ResetFocused();
-
-xTempAcc = maChildren[nNewIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nNewIndex].pAcc)
-maChildren[nNewIndex].pAcc-SetFocused();
+if (0 = nNewIndex static_castsize_t(nNewIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nNewIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nNewIndex].pAcc)
+maChildren[nNewIndex].pAcc-SetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() new
index out of bounds: nNewIndex);
+}
}
void ScAccessibleDataPilotControl::FieldNameChange(sal_Int32 nIndex)
{
-OSL_ENSURE(static_castsize_t(nIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-ChangeName();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-ChangeName();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldNameChange() index
out of bounds: nIndex);
+}
}
void ScAccessibleDataPilotControl::GotFocus()
@@ -298,9 +314,16 @@
OSL_ENSURE(mpFieldWindow-GetFieldCount() == maChildren.size(), did
not recognize a child count change);
sal_Int32 nIndex(mpFieldWindow-GetSelectedField());
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-SetFocused();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-SetFocused();
+}
+else
+{
+
[PATCH] Try one approach to compile a class as one compilation unit
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3373 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3373/1 Try one approach to compile a class as one compilation unit In many cases the sources for some class have been split up into several source files, typically suffixed with a number 0, 1, 2 etc. Presumably this has been done because some compiler years ago was not capable of compiling all the source for that class at one time, or some other no longer relevant reason. It would be nice to get rid of this convention, so that clever compilers have a better chance of noticing unused private fields in a class, for instance. On the other hand, just combining the source files in question into one source file and removing the old source files from git leads to a discontinuity in version control history. Maybe a good compromise would be to introduce one new source file what would include the existing numbered source files? Or, as in this case, include the others into one already appropriately named source file? Change-Id: I79e299ba397c1466a08cbc9bc31817e76a2d67f5 --- M basic/Library_sb.mk M basic/source/runtime/runtime.cxx M basic/source/runtime/step0.cxx M basic/source/runtime/step1.cxx M basic/source/runtime/step2.cxx 5 files changed, 51 insertions(+), 75 deletions(-) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 3568056..a3acbda 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -100,9 +100,6 @@ basic/source/runtime/sbdiagnose \ basic/source/runtime/stdobj \ basic/source/runtime/stdobj1 \ - basic/source/runtime/step0 \ - basic/source/runtime/step1 \ - basic/source/runtime/step2 \ )) endif diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 815030d..ba80ce4 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -17,25 +17,61 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include vcl/svapp.hxx +#include stdlib.h + +#include algorithm + +#include boost/unordered_map.hpp + +#include com/sun/star/beans/XPropertySet.hpp +#include com/sun/star/container/XEnumerationAccess.hpp +#include com/sun/star/container/XIndexAccess.hpp +#include com/sun/star/script/XDefaultMethod.hpp +#include com/sun/star/uno/Any.hxx +#include com/sun/star/util/SearchOptions.hpp + +#include comphelper/processfactory.hxx +#include comphelper/string.hxx + +#include sal/log.hxx + #include tools/wldcrd.hxx + +#include vcl/msgbox.hxx +#include vcl/svapp.hxx + +#include rtl/instance.hxx +#include rtl/math.hxx +#include rtl/ustrbuf.hxx + #include svl/zforlist.hxx + #include unotools/syslocale.hxx -#include runtime.hxx -#include sbintern.hxx -#include opcodes.hxx +#include unotools/textsearch.hxx + +#include basic/sbuno.hxx + +#include basrid.hxx #include codegen.hxx -#include iosys.hxx -#include image.hxx +#include comenumwrapper.hxx #include ddectrl.hxx #include dllmgr.hxx -#include comphelper/processfactory.hxx -#include com/sun/star/container/XEnumerationAccess.hpp -#include sbunoobj.hxx #include errobject.hxx -#include sal/log.hxx +#include image.hxx +#include iosys.hxx +#include opcodes.hxx +#include runtime.hxx +#include sb.hrc +#include sbintern.hxx +#include sbunoobj.hxx -#include comenumwrapper.hxx +using com::sun::star::uno::Reference; + +using namespace com::sun::star::uno; +using namespace com::sun::star::container; +using namespace com::sun::star::lang; +using namespace com::sun::star::beans; +using namespace com::sun::star::script; SbxVariable* getDefaultProp( SbxVariable* pRef ); @@ -1288,4 +1324,8 @@ return pImg-GetBase(); } +#include step0.cxx +#include step1.cxx +#include step2.cxx + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 37e2116..0be0c90 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -17,28 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include comphelper/string.hxx -#include vcl/msgbox.hxx - -#include errobject.hxx -#include runtime.hxx -#include sbintern.hxx -#include iosys.hxx -#include sb.hrc -#include basrid.hxx -#include sbunoobj.hxx -#include image.hxx -#include com/sun/star/uno/Any.hxx -#include com/sun/star/util/SearchOptions.hpp -#include rtl/instance.hxx -#include vcl/svapp.hxx -#include unotools/textsearch.hxx - Reference XInterface createComListener( const Any aControlAny, const OUString aVBAType, const OUString aPrefix, SbxObjectRef xScopeObj ); - -#include algorithm -#include boost/unordered_map.hpp // for a patch forward declaring these methods below makes sense // but, #FIXME lets really just move the methods to the top diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index 7b72129..2ccfbe3
[Libreoffice-commits] dev-tools.git: ciabot/projmap.json
ciabot/projmap.json |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a38f145a2983399aa3523197c3349b32537d6a63
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 16:25:56 2013 +0200
ciabot: typo
Change-Id: Ie4e1020e1cfdd4b7f84646c4e2a49a085fcb9278
diff --git a/ciabot/projmap.json b/ciabot/projmap.json
index 4e53010..272df0d 100644
--- a/ciabot/projmap.json
+++ b/ciabot/projmap.json
@@ -2,6 +2,6 @@
LibreOffice: {
template: %(project)s (%(module)s) [%(branch)s] %(author)s *
%(files)s: %(log)s,
template-None: %(project)s (%(module)s) %(author)s * %(files)s:
%(log)s,
-to: irc://irc.freenode.net/#libreoffice-dev
+to: irc://irc.freenode.net/libreoffice-dev
}
}
___
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/core/crsr/crsrsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8205b65d52cfd0406f4af75bb464965a7d4c201
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 16:32:58 2013 +0200
fdo#45941 cursos - cursor
Change-Id: I10ede9fe8f4694366101458a0ce82b54148cda61
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 15aa218..1e11eea 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -276,7 +276,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
if( !BasicActionPend() )
{
// Within a Basic action, one needs to update the cursor,
-// to e.g. create the table cursos. This is being done in
+// to e.g. create the table cursor. This is being done in
// UpdateCrsr.
UpdateCrsr( SwCrsrShell::CHKRANGE, bIdleEnd );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/slidehack' - sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source
sd/CppunitTest_sd_uimpress.mk |1
sd/Library_sd.mk |1
sd/source/core/slidehack.cxx | 67 -
sd/source/ui/dlg/GroupSlidesDialog.cxx |2
4 files changed, 69 insertions(+), 2 deletions(-)
New commits:
commit 565891c0441488bf4b169ddee1474478bdaa5fbc
Author: Thorsten Behrens tbehr...@suse.com
Date: Sat Apr 13 16:37:50 2013 +0200
Initial reading and parsing from webservice.
Change-Id: I1637f8a8b21464e3883fd3dc8f6bb214dd58f6d0
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 01883f3..23e5500 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
boost_headers \
gtk \
dbus \
+curl \
))
$(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index d4800bd..e7ac01b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -112,6 +112,7 @@ $(eval $(call gb_Library_use_externals,sd,\
boost_headers \
libxml2 \
dbus \
+ curl \
))
ifeq ($(OS),WNT)
diff --git a/sd/source/core/slidehack.cxx b/sd/source/core/slidehack.cxx
index 9a586a4..522b317 100644
--- a/sd/source/core/slidehack.cxx
+++ b/sd/source/core/slidehack.cxx
@@ -9,6 +9,13 @@
#include slidehack.hxx
+#include boost/property_tree/ptree.hpp
+#include boost/property_tree/json_parser.hpp
+
+#include curl/curl.h
+
+using boost::property_tree::ptree;
+
namespace SlideHack {
namespace {
@@ -37,10 +44,68 @@ public:
}
};
+static size_t read_function( void* data, size_t item_size, size_t num_members,
void* user_data )
+{
+if( num_members )
+{
+std::string* pBuffer=(std::string*)user_data;
+pBuffer-append( (const char*)data, item_size*num_members );
+}
+return item_size * num_members;
+}
+
+static boost::shared_ptrptree read_data( CURL* pCurl, const char* url)
+{
+std::string buffer;
+curl_easy_setopt( pCurl, CURLOPT_NOPROGRESS, 1 );
+curl_easy_setopt( pCurl, CURLOPT_WRITEFUNCTION, read_function );
+curl_easy_setopt( pCurl, CURLOPT_WRITEDATA, buffer );
+curl_easy_setopt( pCurl, CURLOPT_URL, url );
+curl_easy_setopt( pCurl, CURLOPT_FOLLOWLOCATION, 1);
+curl_easy_setopt( pCurl, CURLOPT_MAXREDIRS, 100);
+curl_easy_setopt( pCurl, CURLOPT_SSL_VERIFYPEER, 0);
+curl_easy_setopt( pCurl, CURLOPT_SSL_VERIFYHOST, 0);
+#if OSL_DEBUG_LEVEL 2
+curl_easy_setopt( pCurl, CURLOPT_VERBOSE, 0);
+#endif
+
+if( !curl_easy_perform( pCurl ) )
+{
+boost::shared_ptrptree res(new boost::property_tree::ptree);
+std::istringstream stream(buffer);
+boost::property_tree::read_json(stream, *res);
+
+return res;
+}
+
+return boost::shared_ptrptree();
+}
+
class StoreImpl : public Store {
+std::vectorOString m_userList;
+std::vectorOString m_tagList;
+CURL* m_pCurl;
+
public:
-StoreImpl()
+StoreImpl() :
+m_pCurl(NULL)
+{
+curl_global_init( CURL_GLOBAL_ALL );
+m_pCurl = curl_easy_init( );
+
+boost::shared_ptrptree users = read_data( m_pCurl,
https://localhost:8080/api/users/; );
+for( ptree::const_iterator i=users-begin(); i != users-end(); ++i )
+m_userList.push_back( i-first.c_str() );
+
+boost::shared_ptrptree tags = read_data( m_pCurl,
https://localhost:8080/api/tags/; );
+for( ptree::const_iterator i=tags-begin(); i != tags-end(); ++i )
+m_tagList.push_back( i-first.c_str() );
+}
+
+~StoreImpl()
{
+if ( NULL != m_pCurl )
+curl_easy_cleanup( m_pCurl );
}
virtual sal_uInt32 search( OUString aSearchEntry )
diff --git a/sd/source/ui/dlg/GroupSlidesDialog.cxx
b/sd/source/ui/dlg/GroupSlidesDialog.cxx
index d433467..59dd875 100644
--- a/sd/source/ui/dlg/GroupSlidesDialog.cxx
+++ b/sd/source/ui/dlg/GroupSlidesDialog.cxx
@@ -89,7 +89,7 @@ SdGroupSlidesDialog::~SdGroupSlidesDialog()
IMPL_LINK_NOARG(SdGroupSlidesDialog, AddHdl)
{
SAL_DEBUG(Add to group);
-EndDialog(0);
+endDialog(true);
return 0;
}
___
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/core/crsr/crsrsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e70d6fbf4610563b7ff31d0e6393b70b4b0e6510
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Apr 13 16:41:35 2013 +0200
fdo#45941 repeaded - repeated
Change-Id: Iff043de250fb1d81fbd4901a15f7935006edc2df
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1e11eea..e6bf8c5 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1356,7 +1356,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
}
}
-// No table cursor in repeaded headlines:
+// No table cursor in repeated headlines:
if ( bInRepeatedHeadline )
{
pTblFrm = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-3-6] resolved fdo#63421 crash in pivot table with accessibility
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3374
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/3374/1
resolved fdo#63421 crash in pivot table with accessibility
The scenario of fdo#63421 (loading data and re-dragging the same field)
is not needed, simple data is sufficient and crash happened also when
dragging (removing) a field from a pane and dropping it anywhere else.
Multiple errors:
* getAccessibleChildCount() must return the real current count of
children, not what mpFieldWindow says; AtkListener::updateChildList()
uses this value to repopulate its own list; a child is added after it
is added to mpFieldWindow but removed before it is removed from
mpFieldWindow;
* LostFocus() uses an index of -1 if the last child was already removed
and the field was dropped after dragging it away from a pane, handle
that but it still does not look right
* RemoveField() called CommitChange() with
AccessibleEventObject::NewValue set instead of OldValue, leading to
AtkListener::handleChildAdded() being called instead of
handleChildRemoved()
Apparently this never worked since 2002.
(cherry picked from commit 26114dcdf9d55a5a2490de6de619337e9733b0e2)
Conflicts:
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8
---
M sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
1 file changed, 64 insertions(+), 27 deletions(-)
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 0b826fa..c71eff6 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -268,7 +268,7 @@
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference XAccessibleContext (this);
-aEvent.NewValue = xTempAcc;
+aEvent.OldValue = xTempAcc;
CommitChange(aEvent); // gone child - event
@@ -279,25 +279,41 @@
void ScAccessibleDataPilotControl::FieldFocusChange(sal_Int32 nOldIndex,
sal_Int32 nNewIndex)
{
-OSL_ENSURE(static_castsal_uInt32(nOldIndex) maChildren.size()
-static_castsal_uInt32(nNewIndex) maChildren.size(), did
not recognize a child count change);
+if (0 = nOldIndex static_castsize_t(nOldIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nOldIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nOldIndex].pAcc)
+maChildren[nOldIndex].pAcc-ResetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() old
index out of bounds: nOldIndex);
+}
-uno::Reference XAccessible xTempAcc = maChildren[nOldIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nOldIndex].pAcc)
-maChildren[nOldIndex].pAcc-ResetFocused();
-
-xTempAcc = maChildren[nNewIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nNewIndex].pAcc)
-maChildren[nNewIndex].pAcc-SetFocused();
+if (0 = nNewIndex static_castsize_t(nNewIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nNewIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nNewIndex].pAcc)
+maChildren[nNewIndex].pAcc-SetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() new
index out of bounds: nNewIndex);
+}
}
void ScAccessibleDataPilotControl::FieldNameChange(sal_Int32 nIndex)
{
-OSL_ENSURE(static_castsal_uInt32(nIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-ChangeName();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-ChangeName();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldNameChange() index
out of bounds: nIndex);
+}
}
void ScAccessibleDataPilotControl::GotFocus()
@@ -307,9 +323,16 @@
OSL_ENSURE(static_castsal_uInt32(mpDPFieldWindow-GetFieldCount())
== maChildren.size(), did not recognize a child count change);
sal_Int32 nIndex(mpDPFieldWindow-GetSelectedField());
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-SetFocused();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is()
[Libreoffice-commits] core.git: editeng/source filter/source sd/source
editeng/source/editeng/eerdll.cxx |6 --
editeng/source/uno/unonrule.cxx|3 ++-
filter/source/msfilter/svdfppt.cxx |7 ---
sd/source/core/drawdoc4.cxx|3 ++-
sd/source/core/stlpool.cxx |5 +++--
5 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 5785db93c5739846fb0a84b138be485044d4bda5
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date: Wed Apr 10 20:41:54 2013 +0200
fdo#47018 Impress crashes when modifying bullet
Default numbering rules shouldn't be left zero nor hard-coded.
Change-Id: I8a34331006abf3de8c170f8dca43ccf9cec92f04
Reviewed-on: https://gerrit.libreoffice.org/3312
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/editeng/source/editeng/eerdll.cxx
b/editeng/source/editeng/eerdll.cxx
index 59086ea..c6a008d 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -36,6 +36,7 @@
#include editeng/flditem.hxx
#include editeng/emphasismarkitem.hxx
#include editeng/scriptspaceitem.hxx
+#include editeng/numdef.hxx
#include svl/itempool.hxx
#include vcl/virdev.hxx
@@ -98,14 +99,15 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
// Paragraph attributes:
-SvxNumRule aTmpNumRule( 0, 0, sal_False );
+SvxNumRule aDefaultNumRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE,
+SVX_MAX_NUM, sal_False );
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP,
EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION,
sal_False );
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True );
ppDefItems[4] = new SvxScriptSpaceItem( sal_True,
EE_PARA_ASIANCJKSPACING );
-ppDefItems[5] = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET
);
+ppDefItems[5] = new SvxNumBulletItem( aDefaultNumRule,
EE_PARA_NUMBULLET );
ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, sal_False );
ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, sal_True );
ppDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE );
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index ea028e1..cce9583 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -34,6 +34,7 @@
#include editeng/unofdesc.hxx
#include editeng/unonrule.hxx
#include editeng/editids.hrc
+#include editeng/numdef.hxx
using ::com::sun::star::util::XCloneable;
using ::com::sun::star::ucb::XAnyCompare;
@@ -490,7 +491,7 @@ com::sun::star::uno::Reference
com::sun::star::container::XIndexReplace SvxCr
}
else
{
-SvxNumRule aDefaultRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
+SvxNumRule aDefaultRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM ,
sal_False);
return new SvxUnoNumberingRules( aDefaultRule );
}
}
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 1de1b2e..f8530c1 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -47,6 +47,7 @@
#include svx/svdocapt.hxx
#include svx/svdotable.hxx
#include editeng/outlobj.hxx
+#include editeng/numdef.hxx
#include svx/svdattr.hxx
#include svx/xattr.hxx
#include svx/svditext.hxx
@@ -4295,20 +4296,20 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader
rSlideHd, SvStream rIn, Sd
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
case TSS_TYPE_SUBTITLE :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
case TSS_TYPE_BODY :
case TSS_TYPE_HALFBODY :
case TSS_TYPE_QUARTERBODY :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_PRESENTATION_NUMBERING;
break;
default :
case TSS_TYPE_NOTES :
case TSS_TYPE_UNUSED :
case TSS_TYPE_TEXT_IN_SHAPE :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3cdfe86..abbd02b 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -40,6 +40,7 @@
#include editeng/ulspitem.hxx
#include editeng/lspcitem.hxx
#include editeng/adjustitem.hxx
+#include editeng/numdef.hxx
#include svx/dialogs.hrc
#include svx/dialmgr.hxx // SVX_RESSTR
#include editeng/bulletitem.hxx
@@ -1223,7 +1224,7 @@ void
[PUSHED] fdo#47018 Impress crashes when modifying bullet
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3312 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3312 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a34331006abf3de8c170f8dca43ccf9cec92f04 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source filter/source sd/source
editeng/source/editeng/eerdll.cxx |6 --
editeng/source/uno/unonrule.cxx|3 ++-
filter/source/msfilter/svdfppt.cxx |7 ---
sd/source/core/drawdoc4.cxx|3 ++-
sd/source/core/stlpool.cxx |5 +++--
5 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 6f504b6307179f00075bd1dadd722ff2e8855ea9
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date: Wed Apr 10 20:41:54 2013 +0200
fdo#47018 Impress crashes when modifying bullet
Default numbering rules shouldn't be left zero nor hard-coded.
Reviewed-on: https://gerrit.libreoffice.org/3312
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit 5785db93c5739846fb0a84b138be485044d4bda5)
Conflicts:
sd/source/core/drawdoc4.cxx
sd/source/core/stlpool.cxx
Change-Id: I8a34331006abf3de8c170f8dca43ccf9cec92f04
diff --git a/editeng/source/editeng/eerdll.cxx
b/editeng/source/editeng/eerdll.cxx
index 740de3a..0ae4491 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -36,6 +36,7 @@
#include editeng/flditem.hxx
#include editeng/emphitem.hxx
#include editeng/scriptspaceitem.hxx
+#include editeng/numdef.hxx
#include svl/itempool.hxx
#include vcl/virdev.hxx
@@ -98,14 +99,15 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
// Paragraph attributes:
-SvxNumRule aTmpNumRule( 0, 0, sal_False );
+SvxNumRule aDefaultNumRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE,
+SVX_MAX_NUM, sal_False );
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP,
EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION,
sal_False );
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True );
ppDefItems[4] = new SvxScriptSpaceItem( sal_True,
EE_PARA_ASIANCJKSPACING );
-ppDefItems[5] = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET
);
+ppDefItems[5] = new SvxNumBulletItem( aDefaultNumRule,
EE_PARA_NUMBULLET );
ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, sal_False );
ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, sal_True );
ppDefItems[8] = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE );
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 749dad5..52262c8 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -34,6 +34,7 @@
#include editeng/unofdesc.hxx
#include editeng/unonrule.hxx
#include editeng/editids.hrc
+#include editeng/numdef.hxx
using ::rtl::OUString;
using ::com::sun::star::util::XCloneable;
@@ -494,7 +495,7 @@ com::sun::star::uno::Reference
com::sun::star::container::XIndexReplace SvxCr
}
else
{
-SvxNumRule aDefaultRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
+SvxNumRule aDefaultRule(
NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, SVX_MAX_NUM ,
sal_False);
return new SvxUnoNumberingRules( aDefaultRule );
}
}
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 306309d..beb774b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -47,6 +47,7 @@
#include svx/svdocapt.hxx
#include svx/svdotable.hxx
#include editeng/outlobj.hxx
+#include editeng/numdef.hxx
#include svx/svdattr.hxx
#include svx/xattr.hxx
#include svx/svditext.hxx
@@ -4283,20 +4284,20 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader
rSlideHd, SvStream rIn, Sd
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
case TSS_TYPE_SUBTITLE :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
case TSS_TYPE_BODY :
case TSS_TYPE_HALFBODY :
case TSS_TYPE_QUARTERBODY :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_PRESENTATION_NUMBERING;
break;
default :
case TSS_TYPE_NOTES :
case TSS_TYPE_UNUSED :
case TSS_TYPE_TEXT_IN_SHAPE :
-nLevels = 10;
+nLevels = SVX_MAX_NUM;
eNumRuleType = SVX_RULETYPE_NUMBERING;
break;
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3e1b1e1..56b8f08 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -40,6 +40,7 @@
#include editeng/ulspitem.hxx
#include editeng/lspcitem.hxx
#include editeng/adjitem.hxx
+#include editeng/numdef.hxx
[ABANDONED] gcc -dumpversion has only MAJOR.MINOR, not MAJOR.MINOR.PATCH...
Lionel Elie Mamane has abandoned this change. Change subject: gcc -dumpversion has only MAJOR.MINOR, not MAJOR.MINOR.PATCHLEVEL .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/3362 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I94ea73628d8aac107e3ada1dc5a63e51e79ccdb2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/vba/vbavalidation.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 1666281eeafa9e3299c85dfca5d92d53bac40cad Author: Noel Power noel.po...@suse.com Date: Fri Apr 5 21:02:16 2013 +0100 somewhat blind wae fix ( doesn't happen for me ) Change-Id: Ia9b260c8bf2dc948f155fb89f0b5d960f9aada6f (cherry picked from commit 9c79ec29dba9dbdc6dc56f6e83b09f5176821768) Signed-off-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 7431370..b318c8d 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -369,6 +369,9 @@ ScVbaValidation::getType() throw (uno::RuntimeException) case sheet::ValidationType_TEXT_LEN: nExcelType = excel::XlDVType::xlValidateTextLength; break; +case sheet::ValidationType_MAKE_FIXED_SIZE: +default: +break; }; } return nExcelType; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fcfe8817c0cc896cb29de2613d9f43381d7b6ad
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Mar 29 07:18:05 2013 +0100
Initialize nFilter
Change-Id: I9a8606a0d6ca36fd6f51267ea385f7fbe874d6d5
(cherry picked from commit 9f27436b84a1ae0ce2689ef27f81698ab9f3642e)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 3097f1f..a5edb7b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -363,7 +363,7 @@ void SfxTemplateManagerDlg::readSettings ()
if ( aViewSettings.Exists() )
{
-sal_uInt16 nFilter;
+sal_uInt16 nFilter = 0;
aViewSettings.GetUserItem(TM_SETTING_LASTFOLDER) = aLastFolder;
aViewSettings.GetUserItem(TM_SETTING_FILTER) = nFilter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 26b80fc81295ead5e5e43d2b8f3960757ae98c7e Author: Rene Engelhard r...@debian.org Date: Sat Apr 13 19:29:33 2013 +0200 oops, move gb_LinkTarget_add_libs back to correct position... Change-Id: I4eff9417d57b6d949ce511fd508a1a2d73197952 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bcab2b9..80f89a9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2328,12 +2328,12 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(ORCUS_CFLAGS) \ ) +$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS)) endef define gb_LinkTarget__use_orcus-parser endef -$(call gb_LinkTarget_add_libs,$(1),$(ORCUS_LIBS)) else # !SYSTEM_LIBORCUS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fdo#40100 correct result of calc function YEARFRAC
I have access to gerrit again, I will submit there. Verzonden: vrijdag 12 april 2013 17:19 Onderwerp: [PATCH] fdo#40100 correct result of calc function YEARFRAC For some reason I can't connect with gerrit, so I submit this patch in the classic way. The patch improves the calculation of YEARFRAC in case of leap years. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#40100 corect result for calc function YEARFRAC
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3375
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/3375/1
fdo#40100 corect result for calc function YEARFRAC
Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
---
M scaddins/source/analysis/analysishelper.cxx
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 278b26f..100b86f 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -366,21 +366,15 @@
nDay2, nMonth2, nYear2, nMode == 0 ) -
nYears * nDaysInYear;
break;
case 1: // 1=exact/exact
-nYears = nYear2 - nYear1;
+//fdo40100 because of possible leap years calculate number
+//of days separately for year1 and year2 and let nYears
+//contain only number of full calendar years
+nYears = nYear2 - nYear1 - 1;
nDaysInYear = IsLeapYear( nYear1 )? 366 : 365;
-if( nYears ( nMonth1 nMonth2 || ( nMonth1 == nMonth2 nDay1
nDay2 ) ) )
-nYears--;
-
-if( nYears )
-nDayDiff = nDate2 - DateToDays( nDay1, nMonth1, nYear2 );
-else
-nDayDiff = nDate2 - nDate1;
-
-if( nDayDiff 0 )
-nDayDiff += nDaysInYear;
-
+nDayDiff = ( nDate2 - DateToDays( 1, 1, nYear2 ) ) +
+( DateToDays( 31, 12, nYear1 ) - nDate1 ) + 1; //plus 1 for
Dec 31 to Jan 1
break;
case 2: // 2=exact/360
nDaysInYear = 360;
@@ -508,6 +502,18 @@
}
+//TODO: In the case of nMode == 1 (exact), there still remains a small error
+// in the result because of leap years. nDaysInYear is an integer and
+// returns the days in the year of nStartDate. If nEndDate is not a
+// leap year, the year fraction of the days in the year of nEndDate is
+// a little bit too small. If nStardate is not in a leap year, but
+// nEndDate is, then year fraction of the days in the year of nEndDate
+// is a little bit too large.
+// This could be corrected when nDaysInYear is a float and the value
+// reflects the number of days in the leap year and the non-leap year.
+// Example: If there are 80 days in the leap year and 80 days in the
+// non-leap year, then nDaysInYear would be 365.5, resulting in a more
+// or less exact year fraction.
double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32
nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException,
lang::IllegalArgumentException )
{
if( nStartDate == nEndDate )
@@ -517,7 +523,6 @@
sal_Int32 nDayDiff, nDaysInYear;
GetDiffParam( nNullDate, nStartDate, nEndDate, nMode, nYears, nDayDiff,
nDaysInYear );
-
return double( nYears ) + double( nDayDiff ) / double( nDaysInYear );
}
--
To view, visit https://gerrit.libreoffice.org/3375
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - ios/experimental sw/source touch/inc vcl/ios
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |8 +++
ios/experimental/LibreOffice/LibreOffice/AppDelegate.m | 25
++
sw/source/core/crsr/crsrsh.cxx | 12
touch/inc/touch/touch.h| 15
--
vcl/ios/iosinst.cxx| 15
++
5 files changed, 59 insertions(+), 16 deletions(-)
New commits:
commit 860d6a1995253c758bc9431049d26d9c80f8be37
Author: Tor Lillqvist t...@iki.fi
Date: Sat Apr 13 13:00:14 2013 +0300
Nah, SwCrsrShell::{Show,Hide}Crsr() are the wrong places to show/hide
keyboard
At least I think so. Something more complicated is needed, or at least
lots more experimentation.
Change-Id: If511697de12ca8576720d67c80113c579eb66741
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e6bf8c5..c32250c 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include config_features.h
-
#include com/sun/star/util/SearchOptions.hpp
#include com/sun/star/text/XTextRange.hpp
#include hintids.hxx
@@ -64,10 +62,6 @@
#include comcore.hrc
-#if !HAVE_FEATURE_DESKTOP
-#include touch/touch.h
-#endif
-
using namespace com::sun::star;
using namespace util;
@@ -2006,9 +2000,6 @@ void SwCrsrShell::ShowCrsr()
{
m_bSVCrsrVis = sal_True;
UpdateCrsr();
-#if !HAVE_FEATURE_DESKTOP
-lo_show_keyboard();
-#endif
}
}
@@ -2021,9 +2012,6 @@ void SwCrsrShell::HideCrsr()
// possibly reverse selected areas!!
SET_CURR_SHELL( this );
m_pVisCrsr-Hide();
-#if !HAVE_FEATURE_DESKTOP
-lo_hide_keyboard();
-#endif
}
}
commit 410ad97b30691e88bbac4d2fa66e2eecf9bfc060
Author: Tor Lillqvist t...@iki.fi
Date: Sat Apr 13 12:08:24 2013 +0200
Listen for keyboard show and hide notifications
Only react to hide notification for now, call lo_keyboard_did_hide()
Change-Id: I2f429039d2a84269783d103ad635ff4c407c4a15
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index 3a70fa3..223ccf5 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -47,6 +47,9 @@ static UIView *theView;
lo_set_view_size(bounds.size.width, bounds.size.height);
+[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification
object:nil];
+[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardDidHide:) name:UIKeyboardDidHideNotification
object:nil];
+
NSThread* thread = [[NSThread alloc] initWithTarget:self
selector:@selector(threadMainMethod:)
object:nil];
@@ -90,6 +93,28 @@ static UIView *theView;
(void) application;
}
+- (void)keyboardWillShow:(NSNotification *)note
+{
+NSDictionary *info = [note userInfo];
+CGRect frameBegin;
+CGRect frameEnd;
+
+[[info objectForKey:UIKeyboardFrameBeginUserInfoKey] getValue:frameBegin];
+[[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:frameEnd];
+}
+
+- (void)keyboardDidHide:(NSNotification *)note
+{
+NSDictionary *info = [note userInfo];
+CGRect frameBegin;
+CGRect frameEnd;
+
+[[info objectForKey:UIKeyboardFrameBeginUserInfoKey] getValue:frameBegin];
+[[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:frameEnd];
+
+lo_keyboard_did_hide();
+}
+
@end
void lo_damaged(CGRect rect)
commit 2cca07806251c2085661f4639acfdf085c1984fe
Author: Tor Lillqvist t...@iki.fi
Date: Sat Apr 13 13:04:50 2013 +0300
Add experimental lo_keyboard_did_hide() implementation
Change-Id: I24a7449848710c0e09a4bf0da0d906d30a59f0bd
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index a0893af..ebf44ac 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -369,4 +369,19 @@ void lo_tap(int x, int y)
}
}
+extern C
+void lo_keyboard_did_hide()
+{
+// Tell LO it has lost focus, which will cause it to stop
+// displaying any text insertion cursor etc
+
+SalFrame *pFocus = IosSalInstance::getInstance()-getFocusFrame();
+if (pFocus) {
+MouseEvent aEvent;
+
+aEvent = MouseEvent(Point(0, 0), 0, MOUSE_LEAVEWINDOW, MOUSE_LEFT);
+Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEMOVE,
pFocus-GetWindow(), aEvent);
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ab49b49f04a3dd9d3a530193798983d540c031d4
Author: Tor Lillqvist t...@iki.fi
Date: Sat Apr 13 13:03:40 2013 +0300
Add lo_keyboard_did_hide() and improve comment
Change-Id:
Detecting current Keyboard layout in English
Hey everyone, As you know, in Windows libreoffice detects the current input language and can change the current document language accordingly (assuming the user wants this). This works great for language pairs like english/greek that use different alphabets / layouts. It would be nice to have this functionality in Linux as well. I don't believe it will solve all spellchecking issues (e.g., it will still be desirable to be able to do trigram-based language detection per word as well), but it would be a step in the right direction. So, I think this comes down to having a way to be notified about a change in the keyboard layout and to get the current layout for each backend so that GetInputLanguage() in the SalFrame backends of Linux will return something better than LANGUAGE_DONTKNOW. It seems to me that nowadays we could do this using dbus. For KDE: in vcl/unx/kde4/KDESalFrame.cxx: - It should listen for currentLayoutChanged() signal and use getCurrentLayout() of org.kde.keyboard / org.kde.keyboardLayouts For GNOME: in vcl/unx/gtk/window/gtkframe.cxx: - The list of available layouts can be found in org.gnome.desktop.input-sources sources. - The index of the current layout can be read in org.gnome.desktop.input-sources current. - So, it should be possible to subscribe to the changed event for this key. Does this sound like a reasonable plan, is there something I have misunderstood in how input language detection works in libreoffice? Thanks in advance for any suggestions Regards, Pantelis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.cpp|3
src/lib/CDRCollector.h | 12 --
src/lib/CDRContentCollector.cpp | 215 +++-
src/lib/CDRContentCollector.h | 12 +-
src/lib/CDRParser.cpp | 107 +++
src/lib/CDRParser.h |5
src/lib/CDRStylesCollector.cpp | 13 --
src/lib/CDRStylesCollector.h|9 -
src/lib/CDRTypes.h | 18 +--
src/lib/CMXParser.cpp |3
10 files changed, 212 insertions(+), 185 deletions(-)
New commits:
commit 2f023df97fb8b3ddf0fb8590d4a13a1f3ef638be
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sat Apr 13 21:53:02 2013 +0200
Change the way we pass around the line and fill styles
diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index 0eca5eb..b4c0be8 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -33,8 +33,7 @@
#include libcdr_utils.h
libcdr::CDRParserState::CDRParserState()
- : m_fillStyles(), m_lineStyles(), m_bmps(), m_patterns(), m_vects(),
m_pages(),
-m_documentPalette(), m_texts(),
+ : m_bmps(), m_patterns(), m_vects(), m_pages(), m_documentPalette(),
m_texts(),
m_colorTransformCMYK2RGB(0), m_colorTransformLab2RGB(0),
m_colorTransformRGB2RGB(0)
{
cmsHPROFILE tmpRGBProfile = cmsCreate_sRGBProfile();
diff --git a/src/lib/CDRCollector.h b/src/lib/CDRCollector.h
index c81be10..ffbb08e 100644
--- a/src/lib/CDRCollector.h
+++ b/src/lib/CDRCollector.h
@@ -54,8 +54,6 @@ class CDRParserState
public:
CDRParserState();
~CDRParserState();
- std::mapunsigned, CDRFillStyle m_fillStyles;
- std::mapunsigned, CDRLineStyle m_lineStyles;
std::mapunsigned, WPXBinaryData m_bmps;
std::mapunsigned, CDRPattern m_patterns;
std::mapunsigned, WPXBinaryData m_vects;
@@ -98,12 +96,10 @@ public:
virtual void collectClosePath() = 0;
virtual void collectLevel(unsigned level) = 0;
virtual void collectTransform(const CDRTransforms transforms, bool
considerGroupTransform) = 0;
- virtual void collectFildId(unsigned id) = 0;
- virtual void collectOutlId(unsigned id) = 0;
- virtual void collectFild(unsigned id, unsigned short fillType, const
CDRColor color1, const CDRColor color2, const CDRGradient gradient, const
CDRImageFill imageFill) = 0;
- virtual void collectOutl(unsigned id, unsigned short lineType, unsigned
short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor
color, const std::vectorunsigned dashArray,
- unsigned startMarkerId, unsigned endMarkerId) = 0;
+ virtual void collectFillStyle(unsigned short fillType, const CDRColor
color1, const CDRColor color2, const CDRGradient gradient, const
CDRImageFill imageFill) = 0;
+ virtual void collectLineStyle(unsigned short lineType, unsigned short
capsType, unsigned short joinType, double lineWidth,
+double stretch, double angle, const CDRColor
color, const std::vectorunsigned dashArray,
+unsigned startMarkerId, unsigned endMarkerId)
= 0;
virtual void collectRotate(double angle, double cx, double cy) = 0;
virtual void collectFlags(unsigned flags, bool considerFlags) = 0;
virtual void collectPageSize(double width, double height, double offsetX,
double offsetY) = 0;
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index ea43090..a4fbbcd 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -50,7 +50,7 @@
libcdr::CDRContentCollector::CDRContentCollector(libcdr::CDRParserState ps,
libwpg::WPGPaintInterface *painter) :
m_painter(painter),
m_isPageProperties(false), m_isPageStarted(false), m_ignorePage(false),
- m_page(ps.m_pages[0]), m_pageIndex(0), m_currentFildId(0),
m_currentOutlId(0), m_spnd(0),
+ m_page(ps.m_pages[0]), m_pageIndex(0), m_currentFillStyle(),
m_currentLineStyle(), m_spnd(0),
m_currentObjectLevel(0), m_currentGroupLevel(0), m_currentVectLevel(0),
m_currentPageLevel(0),
m_currentImage(), m_currentText(0), m_currentBBox(), m_currentTextBox(),
m_currentPath(),
m_currentTransforms(), m_fillTransforms(), m_polygon(0),
m_isInPolygon(false), m_isInSpline(false),
@@ -108,8 +108,8 @@ void libcdr::CDRContentCollector::collectObject(unsigned
level)
if (!m_isPageStarted !m_currentVectLevel !m_ignorePage)
_startPage(m_page.width, m_page.height);
m_currentObjectLevel = level;
- m_currentFildId = 0;
- m_currentOutlId = 0;
+ m_currentFillStyle = CDRFillStyle();
+ m_currentLineStyle = CDRLineStyle();
m_currentBBox = CDRBox();
}
@@ -490,9 +490,8 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
spanProps.insert(fo:font-size, fontSize, WPX_POINT);
if ((*m_currentText)[i].m_line[j].m_charStyle.m_fontName.len())
spanProps.insert(style:font-name,
(*m_currentText)[i].m_line[j].m_charStyle.m_fontName);
-
Re: Master branch now requires liborcus 0.5.0 or higher.
After having retrieved last fixes, I get this now: /home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/sc/source/filter/orcus/xmlcontext.o: In function `populateTree': /home/julien/compile-libreoffice/libo/sc/source/filter/orcus/xmlcontext.cxx:94: undefined reference to `orcus::xml_structure_tree::walker::get_attributes(std::__debug::vectororcus::xml_structure_tree::entity_name, std::allocatorlt;orcus::xml_structure_tree::entity_name )' /home/julien/compile-libreoffice/libo/sc/source/filter/orcus/xmlcontext.cxx:114: undefined reference to `orcus::xml_structure_tree::walker::get_children(std::__debug::vectororcus::xml_structure_tree::entity_name, std::allocatorlt;orcus::xml_structure_tree::entity_name )' collect2: error: ld returned 1 exit status Julien -- View this message in context: http://nabble.documentfoundation.org/Master-branch-now-requires-liborcus-0-5-0-or-higher-tp4049684p4049786.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Master branch now requires liborcus 0.5.0 or higher.
Pull and re-build liborcus. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk|1
sc/inc/column.hxx |4 +
sc/inc/document.hxx |2
sc/inc/documentimport.hxx | 67
sc/inc/table.hxx|2
sc/source/core/data/column2.cxx | 46 ++
sc/source/core/data/column3.cxx | 41
sc/source/core/data/documentimport.cxx | 104
sc/source/filter/inc/orcusinterface.hxx | 13 ++--
sc/source/filter/orcus/interface.cxx| 57 -
10 files changed, 260 insertions(+), 77 deletions(-)
New commits:
commit c03d5def337a112939b9864391f7b246c4e13fb5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Apr 13 11:17:06 2013 -0400
ScDocumentImport accessor to provide efficient means to fill document.
Import filters should be using this class to populate ScDocument, instead
of filling it directly to ScDocument, and do all the broadcasting etc only
once at the end of each import session.
Change-Id: Ifc663e3dcf6b2ec96aaa185006af7ae9b9940af3
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 527d0d7..5b82620 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/documen8 \
sc/source/core/data/documen9 \
sc/source/core/data/document \
+ sc/source/core/data/documentimport \
sc/source/core/data/dpdimsave \
sc/source/core/data/dpfilteredcache \
sc/source/core/data/dpglobal \
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e872d87e..8e076ee 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -74,6 +74,7 @@ struct ScColWidthParam;
class ScColumnTextWidthIterator;
struct ScFormulaCellGroup;
struct ScRefCellValue;
+class ScDocumentImport;
typedef ::boost::intrusive_ptrScFormulaCellGroup ScFormulaCellGroupRef;
@@ -140,6 +141,7 @@ friend class ScCellIterator;
friend class ScHorizontalCellIterator;
friend class ScHorizontalAttrIterator;
friend class ScColumnTextWidthIterator;
+friend class ScDocumentImport;
ScColumn(const ScColumn); // disabled
ScColumn operator= (const ScColumn); // disabled
@@ -463,6 +465,8 @@ private:
void CellStorageModified();
void CopyScriptTypesToDocument(SCROW nRow1, SCROW nRow2, ScColumn
rDestCol) const;
+
+void SetCell(SCROW nRow, ScBaseCell* pNewCell);
};
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a6438ad..030dd21 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -145,6 +145,7 @@ class ScNotes;
class ScEditDataArray;
class EditTextObject;
struct ScRefCellValue;
+class ScDocumentImport;
namespace com { namespace sun { namespace star {
namespace lang {
@@ -219,6 +220,7 @@ friend class ScColumnTextWidthIterator;
friend class ScFormulaCell;
friend class ScTable;
friend struct ScRefCellValue;
+friend class ScDocumentImport;
typedef ::std::vectorScTable* TableContainer;
private:
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
new file mode 100644
index 000..eca8021
--- /dev/null
+++ b/sc/inc/documentimport.hxx
@@ -0,0 +1,67 @@
+/* -*- 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 SC_DOCUMENTIMPORT_HXX
+#define SC_DOCUMENTIMPORT_HXX
+
+#include scdllapi.h
+#include address.hxx
+
+#include rtl/ustring.hxx
+
+class ScDocument;
+class ScAddress;
+class ScTokenArray;
+class ScBaseCell;
+
+/**
+ * Accessor class to ScDocument. Its purpose is to allow import filter to
+ * fill the document model and nothing but that. Filling the document via
+ * this class does not trigger any kind of broadcasting, drawing object
+ * position calculation, or anything else that requires expensive
+ * computation which are unnecessary and undesirable during import.
+ */
+class SC_DLLPUBLIC ScDocumentImport
+{
+ScDocument mrDoc;
+
+ScDocumentImport(); // disabled
+
+public:
+ScDocumentImport(ScDocument rDoc);
+ScDocumentImport(const ScDocumentImport r);
+
+ScDocument getDoc();
+const ScDocument getDoc() const;
+
+/**
+ * @param rName sheet name.
+ *
+ * @return 0-based sheet index, or -1 in case no sheet is found by
+ * specified name.
+ */
+SCTAB getSheetIndex(const OUString rName) const;
+SCTAB getSheetCount() const;
+bool appendSheet(const OUString rName);
+
+void setOriginDate(sal_uInt16 nYear, sal_uInt16 nMonth, sal_uInt16 nDay);
+
+void setAutoInput(const ScAddress rPos, const OUString rStr);
+void setNumericCell(const ScAddress rPos, double fVal);
+void setStringCell(const
[PATCH] WIP: date/time IDL datatypes incompatible change
Hello LibreOffice gerrit bot, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2783 to look at the new patch set (#11). Change subject: WIP: date/time IDL datatypes incompatible change .. WIP: date/time IDL datatypes incompatible change Done: - nanosecond precision - signed (allowed negative) year TODO: timezone Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/formcomponenthandler.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/inc/chgtrack.hxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/chgtrack.cxx M sc/source/core/tool/chgviset.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/oox/unitconverter.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xcl97/XclImpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/docshell/docsh3.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/bastyp/helper.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/doc/docredln.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/Library_tl.mk M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/4848490cb5465c873c3912badcf330416afb35
53/4848490cb5465c873c3912badcf330416afb35 |1 + 1 file changed, 1 insertion(+) New commits: commit 6c91c9b975125096276cd65410a9743e4445ab0f Author: Xisco Fauli aniste...@gmail.com Date: Sat Apr 13 23:16:26 2013 +0200 Notes added by 'git notes add' diff --git a/53/4848490cb5465c873c3912badcf330416afb35 b/53/4848490cb5465c873c3912badcf330416afb35 new file mode 100644 index 000..c410ce0 --- /dev/null +++ b/53/4848490cb5465c873c3912badcf330416afb35 @@ -0,0 +1 @@ +ignore: adds a new interface extending an already existing one ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
