[Libreoffice-commits] core.git: scp2/InstallModule_firebird.mk
scp2/InstallModule_firebird.mk |4 1 file changed, 4 insertions(+) New commits: commit 0d7facdf06728bb1dfeb13ecca199184638c2c3b Author: Rene Engelhard Date: Wed Jul 17 08:47:38 2013 +0200 InstallModule_firebird.mk: actually define SYSTEM_FIREBIRD Change-Id: I3250eddfb1a718b45694624a3d881210d2136ec4 diff --git a/scp2/InstallModule_firebird.mk b/scp2/InstallModule_firebird.mk index b11169f..4ee945d 100644 --- a/scp2/InstallModule_firebird.mk +++ b/scp2/InstallModule_firebird.mk @@ -14,4 +14,8 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/firebird,\ scp2/source/firebird/module_firebird \ )) +$(eval $(call gb_InstallModule_define_if_set,scp2/firebird,\ +SYSTEM_FIREBIRD \ +)) + # vim: set shiftwidth=4 tabstop=4 noexpandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/FConnection.cxx |2 +-
connectivity/source/drivers/firebird/FConnection.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f2ef6605e294d3a95dc1c9639e4c23245988e61a
Author: Andrzej J.R. Hunt
Date: Wed Jul 17 08:05:19 2013 +0200
Make m_aMutex a member variable rather than base type.
Change-Id: I91491af582b57ae602b89a971ccbe5e4901834bf
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx
b/connectivity/source/drivers/firebird/FConnection.cxx
index 5cb0200..f9ba966 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star::uno;
const OUString OConnection::sDBLocation( "firebird.fdb" );
OConnection::OConnection(FirebirdDriver*_pDriver)
-:OMetaConnection_BASE(m_aMutex),
+:OConnection_BASE(m_aMutex),
OSubComponent((::cppu::OWeakObject*)_pDriver, this),
m_xMetaData(NULL),
m_bIsEmbedded(sal_False),
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx
b/connectivity/source/drivers/firebird/FConnection.hxx
index 789b724..67771f9 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -77,13 +77,13 @@ namespace connectivity
typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector;
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper >
OWeakRefArray;
-class OConnection : public OBase_Mutex,
-public OConnection_BASE,
+class OConnection : public OConnection_BASE,
public connectivity::OSubComponent
{
friend class connectivity::OSubComponent;
protected:
+::osl::Mutexm_aMutex;
static const OUString sDBLocation; // Location within .odb
container
rtl_TextEncodingm_nTextEncoding; // the
encoding which is used for all text conversions
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 24
solenv/inc/minor.mk |4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit b8bcfade5731297dc64c02afd64ba0ea3b4f5132
Author: Andras Timar
Date: Tue Jul 16 22:52:01 2013 -0700
Bump for 4.0-8
Change-Id: I860273728512700469934aa4eabb4827f5247a90
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index a992124..76b6df0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 7
+WINDOWSPATCHLEVEL 8
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-307
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-307
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -7
+PRODUCTEXTENSION -8
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-307
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 3e4247e..dbced39 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:307)
-BUILD=307
+RSCREVISION=400m1(Build:308)
+BUILD=308
LAST_MINOR=m0
SOURCEVERSION=OOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/FResultSetMetaData.cxx |1 +
connectivity/source/drivers/firebird/FServices.cxx | 12 +++-
connectivity/source/drivers/firebird/FStatement.cxx |2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 30905e486b4c0b40b893a4c0a31e7e6daee28ffc
Author: Andrzej J.R. Hunt
Date: Wed Jul 17 07:35:53 2013 +0200
Fix clang warnings in firebird-sdbc.
Change-Id: I89c0f22e8db166537f1d6b9313f94c9c3631f195
diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
index f756bc0..d8f0539 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
@@ -44,6 +44,7 @@ using namespace com::sun::star::sdbc;
// -
OResultSetMetaData::~OResultSetMetaData()
{
+(void) m_pConnection; // To remove warning until the rest of the class is
implemented..
}
// -
// -
diff --git a/connectivity/source/drivers/firebird/FServices.cxx
b/connectivity/source/drivers/firebird/FServices.cxx
index 9bda80f..381b6ea 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -104,12 +104,14 @@ struct ProviderRequest
)
{
if (!xRet.is() && (Implname == sImplementationName))
-try
-{
-xRet = creator( xServiceManager, sImplementationName,Factory,
Services,0);
-}
-catch(...)
{
+try
+{
+xRet = creator( xServiceManager, sImplementationName,Factory,
Services,0);
+}
+catch(...)
+{
+}
}
return xRet.is();
}
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx
b/connectivity/source/drivers/firebird/FStatement.cxx
index 7823380..2646330 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/FStatement.cxx
@@ -71,7 +71,7 @@ static int pr_error (const ISC_STATUS* status, const char*
operation)
isc_print_status(status);
-printf("SQLCODE:%d\n", isc_sqlcode(status));
+//printf("SQLCODE:%d\n", isc_sqlcode(status)); Causes warning on some
platforms
printf("]\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/address.hxx |1
sc/source/core/inc/refupdat.hxx | 32 +++--
sc/source/core/tool/address.cxx | 18 ++
sc/source/core/tool/compiler.cxx | 114 +-
sc/source/core/tool/refupdat.cxx | 242 +--
5 files changed, 229 insertions(+), 178 deletions(-)
New commits:
commit d944f0a90527452f0ad15ff3151b295407643908
Author: Kohei Yoshida
Date: Tue Jul 16 23:31:51 2013 -0400
More on removing CalcAbsIfRel().
One test fails. I'll look into that next.
Change-Id: I4a40104187a73953769740fd47d7a917c83bf337
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 84c62cb..2a38827 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -507,6 +507,7 @@ public:
SC_DLLPUBLIC void Justify();
SC_DLLPUBLIC void ExtendTo( const ScRange& rRange );
SC_DLLPUBLIC bool Intersects( const ScRange& ) const;// do two ranges
intersect?
+void PutInOrder();
inline bool operator==( const ScRange& r ) const;
inline bool operator!=( const ScRange& r ) const;
inline bool operator<( const ScRange& r ) const;
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 1d9f4c2..8252005 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -58,17 +58,31 @@ public:
sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz,
ScBigRange& rWhat );
-/// Before calling, the absolute references must be up-to-date!
-static ScRefUpdateRes Update( ScDocument* pDoc,
- UpdateRefMode eUpdateRefMode,
- const ScAddress& rPos, const ScRange& rRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- ScComplexRefData& rRef, WhatType eWhat = ALL
);
+/**
+ * Update range reference in response to row / column insertion / removal,
+ * copy-n-pasting of formula cell, moving of cells etc.
+ *
+ * @param pDoc
+ * @param eUpdateRefMode
+ * @param rPos position of formula cell that has the range reference.
+ * @param rRange range of cells being shifted.
+ * @param nDx
+ * @param nDy
+ * @param nDz
+ * @param rRef range reference object
+ * @param eWhat
+ *
+ * @return ScRefUpdateRes
+ */
+static ScRefUpdateRes Update(
+ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScAddress& rPos,
+const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
+ScComplexRefData& rRef, ScRange& rRefRange, WhatType eWhat = ALL );
/// Before calling, the absolute references must be up-to-date!
-static ScRefUpdateRes Move( ScDocument* pDoc, const ScAddress& rPos,
-SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-ScComplexRefData& rRef, bool bWrap, bool
bAbsolute );
+static ScRefUpdateRes Move(
+ScDocument* pDoc, const ScAddress& rPos, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz,
+ScComplexRefData& rRef, ScRange& rRefRange, bool bWrap, bool bAbsolute
);
static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData&
rRef );
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index e21aa19..33c653e 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1337,6 +1337,24 @@ bool ScRange::Intersects( const ScRange& r ) const
);
}
+void ScRange::PutInOrder()
+{
+SCCOL nCol1 = aStart.Col(), nCol2 = aEnd.Col();
+SCROW nRow1 = aStart.Row(), nRow2 = aEnd.Row();
+SCTAB nTab1 = aStart.Tab(), nTab2 = aEnd.Tab();
+
+::PutInOrder(nCol1, nCol2);
+::PutInOrder(nRow1, nRow2);
+::PutInOrder(nTab1, nTab2);
+
+aStart.SetCol(nCol1);
+aStart.SetRow(nRow1);
+aStart.SetTab(nTab1);
+
+aEnd.SetCol(nCol2);
+aEnd.SetRow(nRow2);
+aEnd.SetTab(nTab2);
+}
void ScRange::Justify()
{
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index cd5cef0..494ed65 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4206,13 +4206,16 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
aNewRef.IncRow(nDy);
aNewRef.IncTab(nDz);
if ( r.In( aNewRef ) )
-{ // yes, this is URM_MOVE
-if ( ScRefUpdate::Update( pDoc, URM_MOVE, aPos,
-r, nDx, nDy, nDz,
-SingleDoubleRefModifier( rRef ).Ref() )
-!= UR_NOTHING
-)
+{
+SingleDoubleRefModifier aMod(rRef);
+ScComplexRefData& rRef2 = aMod.Ref();
+ScRange aRefRange = rRef2.toAbs(rOldPos);
+// yes, this is URM_MOVE
+
[Libreoffice-commits] core.git: Branch 'feature/android-remote-ng' - 5 commits - android/sdremote
android/sdremote/AndroidManifest.xml |7 android/sdremote/res/drawable-hdpi/ic_action_grid.png |binary android/sdremote/res/drawable-hdpi/ic_action_pager.png |binary android/sdremote/res/drawable-mdpi/ic_action_grid.png |binary android/sdremote/res/drawable-mdpi/ic_action_pager.png |binary android/sdremote/res/drawable-nodpi/slide_unknown.png |binary android/sdremote/res/drawable-xhdpi/ic_action_grid.png |binary android/sdremote/res/drawable-xhdpi/ic_action_pager.png |binary android/sdremote/res/drawable/background_grid_slide.xml | 17 android/sdremote/res/drawable/background_pager_slide.xml | 17 android/sdremote/res/layout/fragment_slides_grid.xml | 14 android/sdremote/res/layout/fragment_slides_pager.xml | 13 android/sdremote/res/layout/view_grid_slide.xml | 27 + android/sdremote/res/layout/view_pager_slide.xml |7 android/sdremote/res/menu/menu_action_bar_slide_show_grid.xml | 10 android/sdremote/res/menu/menu_action_bar_slide_show_pager.xml | 10 android/sdremote/res/values/colors.xml |5 android/sdremote/res/values/dimens.xml |9 android/sdremote/res/values/strings.xml |4 android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java | 10 android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java | 13 android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java | 10 android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java |2 android/sdremote/src/org/libreoffice/impressremote/Intents.java | 14 android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java | 10 android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java | 104 + android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java | 108 + android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java | 170 android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java | 62 +++ android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java | 189 ++ android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java |8 android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java | 11 android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java | 12 33 files changed, 854 insertions(+), 9 deletions(-) New commits: commit 1f516b07992b6d20a6349418122e3e5fa41bdab5 Author: Artur Dryomov Date: Wed Jul 17 01:16:02 2013 +0300 Add a basic slide show activity. Slides grid and pager could be switched now. Change-Id: I2c29f36b16c247f1d895773d90766828f571a375 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 72d692b..c2f9ed4 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -38,11 +38,16 @@ + + + diff --git a/android/sdremote/res/drawable-hdpi/ic_action_grid.png b/android/sdremote/res/drawable-hdpi/ic_action_grid.png new file mode 100755 index 000..6b58c2d Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/ic_action_grid.png differ diff --git a/android/sdremote/res/drawable-hdpi/ic_action_pager.png b/android/sdremote/res/drawable-hdpi/ic_action_pager.png new file mode 100755 index 000..3f93d33 Binary files /dev/null and b/android/sdremote/res/drawable-hdpi/ic_action_pager.png differ diff --git a/android/sdremote/res/drawable-mdpi/ic_action_grid.png b/android/sdremote/res/drawable-mdpi/ic_action_grid.png new file mode 100755 index 000..5b87a5f Binary files /dev/null and b/android/sdremote/res/drawable-mdpi/ic_action_grid.png differ diff --git a/android/sdremote/res/drawable-mdpi/ic_action_pager.png b/android/sdremote/res/drawable-mdpi/ic_action_pager.png new file mode 100755 index 000..9b542d2 Binary files /dev/null and b/android/sdremote/res/drawable-mdpi
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/inc sw/source
sw/inc/IDocumentStatistics.hxx |6 --
sw/inc/doc.hxx |7 ---
sw/source/core/doc/doc.cxx | 19 +++
sw/source/ui/uiview/view2.cxx |2 +-
4 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 699b7626222ea8be1c9713a7f5e274dbfbc029ff
Author: Miklos Vajna
Date: Tue Jul 16 18:26:18 2013 +0200
fdo#63273 sw: let word count not update stat. fields
Updating fields would generate loads of selection change events and it's
not what we asked for.
Regression from ce14342c4292628a641a72d4f63d9c048e030c6a.
(cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3)
Change-Id: If237df1f31436357022ca8d77b924681e403abd8
Reviewed-on: https://gerrit.libreoffice.org/4943
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 2c5a0501..950ea49 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -43,8 +43,9 @@
* modified and returns a reference to the result.
* \param bCompleteAsync if true will return a partial result,
* and potentially trigger a timeout to complete the work.
+ * \param bFields if stat. fields should be updated
*/
-virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync) = 0;
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool
bFields) = 0;
/// Set the document statistics
virtual void SetDocStat(const SwDocStat& rStat) = 0;
@@ -53,8 +54,9 @@
* Updates the internal document's statistics
* \param bCompleteAsync if true it may do part of the
* work and trigger a timeout to complete it.
+ * \param bFields if stat. fields should be updated
*/
-virtual void UpdateDocStat(bool bCompleteAsync) = 0;
+virtual void UpdateDocStat(bool bCompleteAsync, bool bFields) = 0;
protected:
virtual ~IDocumentStatistics() {};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0769ae2..98a0c30 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -912,9 +912,9 @@ public:
*/
virtual void DocInfoChgd();
virtual const SwDocStat &GetDocStat() const;
-virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false);
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false,
bool bFields = true);
virtual void SetDocStat(const SwDocStat& rStat);
-virtual void UpdateDocStat(bool bCompleteAsync = false);
+virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields =
true);
/** IDocumentState
*/
@@ -2087,10 +2087,11 @@ private:
/** continue computing a chunk of document statistics
* \param nTextNodes number of paragraphs to calculate before
* exiting
+ * \param bFields if stat. fields should be updated
*
* returns false when there is no more to calculate
*/
-bool IncrementalDocStatCalculate(long nTextNodes = 250);
+bool IncrementalDocStatCalculate(long nTextNodes = 250, bool bFields =
true);
/// Our own 'StatsUpdateTimer' calls the following method
DECL_LINK( DoIdleStatsUpdate, Timer * );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index ba3c943..f52766d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1120,11 +1120,11 @@ const SwDocStat& SwDoc::GetDocStat() const
return *mpDocStat;
}
-const SwDocStat& SwDoc::GetUpdatedDocStat( bool bCompleteAsync )
+const SwDocStat& SwDoc::GetUpdatedDocStat( bool bCompleteAsync, bool bFields )
{
if( mpDocStat->bModified )
{
-UpdateDocStat( bCompleteAsync );
+UpdateDocStat( bCompleteAsync, bFields );
}
return *mpDocStat;
}
@@ -1644,7 +1644,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
// returns true while there is more to do
-bool SwDoc::IncrementalDocStatCalculate( long nTextNodes )
+bool SwDoc::IncrementalDocStatCalculate( long nTextNodes, bool bFields )
{
mpDocStat->Reset();
mpDocStat->nPara = 0; // default is 1!
@@ -1728,8 +1728,11 @@ bool SwDoc::IncrementalDocStatCalculate( long nTextNodes
)
}
// optionally update stat. fields
-SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
-pType->UpdateFlds();
+if (bFields)
+{
+SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
+pType->UpdateFlds();
+}
return nTextNodes <= 0;
}
@@ -1746,16 +1749,16 @@ IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
return 0;
}
-void SwDoc::UpdateDocStat( bool bCompleteAsync )
+void SwDoc::UpdateDocStat( bool bCompleteAsync, bool bFields )
{
if( mpDocStat->bModified )
{
if (!bCompleteAsync)
{
-while (IncrementalDocStatCalculate()) {}
+while (IncrementalDocStatCalculate(250, bFields)) {}
maStatsUpdateTimer.Stop();
}
-else if (In
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/tool/compiler.cxx |8 +-
sc/source/core/tool/refupdat.cxx | 117 ---
2 files changed, 64 insertions(+), 61 deletions(-)
New commits:
commit 7c03f3b0e2be8cd682bbbf0d177b80334b1cebb7
Author: Kohei Yoshida
Date: Tue Jul 16 17:22:00 2013 -0400
Annotate this function before reworking.
To have a good understanding of the code flow in this function.
Change-Id: I6324201b5b0c3871ba0d804a9ac7fa5dc37462a5
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1787f5a..cd5cef0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4297,11 +4297,9 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
case svSingleRef:
{
t->CalcAbsIfRel( rOldPos );
-if ( ScRefUpdate::Update( pDoc, eUpdateRefMode,
-aPos, r, nDx, nDy, nDz,
-SingleDoubleRefModifier(
-t->GetSingleRef()).Ref())
-!= UR_NOTHING)
+SingleDoubleRefModifier aRefMod(t->GetSingleRef());
+ScComplexRefData& rRef = aRefMod.Ref();
+if (ScRefUpdate::Update(pDoc, eUpdateRefMode, aPos, r,
nDx, nDy, nDz, rRef) != UR_NOTHING)
rChanged = true;
}
break;
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 4f97c40..c4e493d 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -488,6 +488,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eMode,
{
ScRefUpdateRes eRet = UR_NOTHING;
+// Range that shifted.
SCCOL nCol1 = r.aStart.Col();
SCROW nRow1 = r.aStart.Row();
SCTAB nTab1 = r.aStart.Tab();
@@ -497,18 +498,20 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eMode,
if( eMode == URM_INSDEL )
{
+// Insertion or deletion
bool bExpand = pDoc->IsExpandRefs();
const ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
bool bInDeleteUndo =
( pChangeTrack ? pChangeTrack->IsInDeleteUndo() : false );
-SCCOL oldCol1 = rRef.Ref1.nCol;
-SCROW oldRow1 = rRef.Ref1.nRow;
-SCTAB oldTab1 = rRef.Ref1.nTab;
-SCCOL oldCol2 = rRef.Ref2.nCol;
-SCROW oldRow2 = rRef.Ref2.nRow;
-SCTAB oldTab2 = rRef.Ref2.nTab;
+// Store the old reference range.
+SCCOL nOldCol1 = rRef.Ref1.nCol;
+SCROW nOldRow1 = rRef.Ref1.nRow;
+SCTAB nOldTab1 = rRef.Ref1.nTab;
+SCCOL nOldCol2 = rRef.Ref2.nCol;
+SCROW nOldRow2 = rRef.Ref2.nRow;
+SCTAB nOldTab2 = rRef.Ref2.nTab;
bool bRef1ColDel = rRef.Ref1.IsColDeleted();
bool bRef2ColDel = rRef.Ref2.IsColDeleted();
@@ -517,14 +520,13 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eMode,
bool bRef1TabDel = rRef.Ref1.IsTabDeleted();
bool bRef2TabDel = rRef.Ref2.IsTabDeleted();
-if( nDx &&
-((rRef.Ref1.nRow >= nRow1
- && rRef.Ref2.nRow <= nRow2) || (bRef1RowDel || bRef2RowDel))
-&&
-((rRef.Ref1.nTab >= nTab1
- && rRef.Ref2.nTab <= nTab2) || (bRef1TabDel || bRef2TabDel))
- )
+if (nDx &&
+((nRow1 <= rRef.Ref1.nRow && rRef.Ref2.nRow <= nRow2) ||
(bRef1RowDel || bRef2RowDel)) &&
+((nTab1 <= rRef.Ref1.nTab && rRef.Ref2.nTab <= nTab2) ||
(bRef1TabDel || bRef2TabDel)))
{
+// Shift in the column direction, reference range has at least one
+// deleted row or sheet, and the reference range is within the
+// shifted region.
bool bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nCol,
rRef.Ref2.nCol, nCol1, nDx ));
bool bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
@@ -559,14 +561,14 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eMode,
eRet = UR_UPDATED;
}
}
-if( nDy &&
-((rRef.Ref1.nCol >= nCol1
- && rRef.Ref2.nCol <= nCol2) || (bRef1ColDel || bRef2ColDel))
-&&
-((rRef.Ref1.nTab >= nTab1
- && rRef.Ref2.nTab <= nTab2) || (bRef1TabDel || bRef2TabDel))
- )
+
+if (nDy &&
+((nCol1 <= rRef.Ref1.nCol && rRef.Ref2.nCol <= nCol2) ||
(bRef1ColDel || bRef2ColDel)) &&
+((nTab1 <= rRef.Ref1.nTab && rRef.Ref2.nTab <= nTab2) ||
(bRef1TabDel || bRef2TabDel)))
{
+// Shift in the row direction, reference range has at least one
+// deleted column or sheet, and the reference range is within the
+// shifted region.
bool bExp = (bExpand && !
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec32bf0b19cbebc43ea2e8e25efc7ae42dfafd6b Author: László Németh Date: Tue Jul 16 18:29:55 2013 +0200 Updated core Project: help a14b0defe8aec0eb8e80827e5c9cc76ebe742fd3 diff --git a/helpcontent2 b/helpcontent2 index a1aa7b0..a14b0de 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a1aa7b04de5f17eb754341962987bdb8ab3343fe +Subproject commit a14b0defe8aec0eb8e80827e5c9cc76ebe742fd3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/librelogo/LibreLogo.xhp | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) New commits: commit a14b0defe8aec0eb8e80827e5c9cc76ebe742fd3 Author: László Németh Date: Tue Jul 16 18:29:55 2013 +0200 update librelogo help (SVG image saving, small fixes) Change-Id: I8c91a77251034e7837a47d64d178c5063d03b759 diff --git a/source/text/swriter/librelogo/LibreLogo.xhp b/source/text/swriter/librelogo/LibreLogo.xhp index f8ab88e..ea92171 100644 --- a/source/text/swriter/librelogo/LibreLogo.xhp +++ b/source/text/swriter/librelogo/LibreLogo.xhp @@ -25,13 +25,13 @@ LibreLogo -LibreLogo is a simple, native, Logo-like programming environment with turtle vector graphics for teaching of computing (programming and word processing), DTP and graphic design. See http://www.numbertext.org/logo/librelogo.pdf";>http://www.numbertext.org/logo/librelogo.pdf. +LibreLogo is a simple, localized, Logo-like programming environment with turtle vector graphics for teaching of computing (programming and word processing), DTP and graphic design. See http://www.numbertext.org/logo/librelogo.pdf";>http://www.numbertext.org/logo/librelogo.pdf. LibreLogo toolbar The LibreLogo toolbar (View » Toolbars » Logo) contains turtle moving, program run and stop, home and clear screen and syntax highlighting/translating icons and an input bar (command line). Turtle moving icons They are equivalents of the Logo commands âFORWARD 10â, âBACK 10â, âLEFT 15â, âRIGHT 15â. Clicking on one of the icons will also focus the turtle shape scrolling the page to its position. Program run and start -Click on the icon ârunâ to execute the text of the Writer document as a LibreLogo program. +Click on the icon ârunâ to execute the text (or only the selected) text of the Writer document as a LibreLogo program. Click on the icon âstopâ to stop the program execution. Home Click on the icon âhomeâ to reset the position and settings of the turtle. @@ -47,7 +47,7 @@ Program editing LibreLogo drawings and programs use the same Writer document. The LibreLogo canvas is on the first page of the Writer document. You can insert a page break before the LibreLogo programs and set the zoom/font size for a comfortable two page layout for LibreLogo programming: left (first) page is the canvas, right (second) page is for the LibreLogo programs. LibreLogo programming language -LibreLogo is a native, easily localisable, Logo-like programming language. It is back-compatible with the older Logo systems in the case of the simple Logo programs used in education, eg. +LibreLogo is an easily localizable, Logo-like programming language, localized in several languages by LibreOffice native language communities. It is back-compatible with the older Logo systems in the case of the simple Logo programs used in education, eg. TO triangle :size REPEAT 3 [ FORWARD :size LEFT 120 ] END triangle 10 triangle 100 triangle 200 Differences from the Logo programming language @@ -79,7 +79,7 @@ String notation supports also orthographical and Python syntax. - PRINT "word" ; original Logo syntax PRINT âArbitrary text.â ; orthography, Writer PRINT 'Arbitrary text.' ; Python syntax + PRINT "word ; original Logo syntax PRINT âArbitrary text.â ; orthography, Writer PRINT 'Arbitrary text.' ; Python syntax Python list and string handling @@ -133,7 +133,7 @@ POSITION (pos) POSITION [0, 0] ; turn and move to the top-left corner POSITION PAGESIZE ; turn and move to the bottom-right corner POSITION [PAGESIZE[0], 0] ; turn and move to the top-right corner POSITION ANY ; turn and move to a random position HEADING (seth) - HEADING 0 ; turn north HEADING 12h ; see above HEADING ANY ; turn to a random position + HEADING 0 ; turn north HEADING 12h ; see above HEADING [0, 0] ; turn to the top-left corner HEADING ANY ; turn to a random direction Other turtle commands HIDETURTLE (ht) HIDETURTLE ; hide turtle (until the showturtle command) @@ -195,6 +195,9 @@ starting new line shapes; +file saving; + + keeping the consistency of positions and line shapes at the left border. @@ -204,6 +207,8 @@ TO tree location PENUP POSITION location HEADING 0 PENDOWN PICTURE [ FORWARD 100 CIRCLE 100 ] ; tree-like grouped shape END PICTURE [ tree [30, 50] tree [100, 50] ] ; grouped shapes in a grouped shape Starting new line shapes PICTURE ; start a new line shape FORWARD 10 PICTURE FORWARD 10 ; two line shapes +File saving (only SVG) + PICTURE âexample.svgâ [ CIRCLE 5 ] ; save the picture as an SVG image file in the user folder PICTURE âDesktop/example.svgâ [ FORWARD 100 CIRCLE 5 ] ; as above, with a relative path PICTURE â/home/user/example.svgâ [ CIRCLE 5 ] ; absolute path for Unix/Linux PICTURE âC:\e
[Libreoffice-commits] core.git: connectivity/source RepositoryExternal.mk
RepositoryExternal.mk |4 --
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 24 +
2 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit 7309fda7fa9d072f043782af78c13f9c79c93455
Author: Andrzej J.R. Hunt
Date: Tue Jul 16 22:40:47 2013 +0200
Don't use firebird internal headers.
Change-Id: Ida2f3599c2904c1c9a01a46656b8e8cd308a6f52
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df57e1a..8bfe445 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2118,9 +2118,7 @@ define gb_LinkTarget__use_libfbembed
$(call gb_LinkTarget_use_package,$(1),firebird)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include \
- -I$(call gb_UnpackedTarball_get_dir,firebird)/src/include/gen \
- -I$(call gb_UnpackedTarball_get_dir,firebird)/src/jrd \
+ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
)
$(call gb_LinkTarget_use_libraries,$(1),\
fbembed \
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 6852c5e..ad453d7 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -42,9 +42,7 @@
#include
#include
-#include
-#include
-#include
+#include
using namespace connectivity::firebird;
using namespace com::sun::star::uno;
@@ -127,34 +125,34 @@ sal_Bool SAL_CALL
ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() th
//- Max Sizes/Lengths -
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength()
throw(SQLException, RuntimeException)
{
-return MAX_COLUMN_SIZE;
+return 32767;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException,
RuntimeException)
{
-return MAX_COLUMN_SIZE;
+return 32767;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength()
throw(SQLException, RuntimeException)
{
-return MAX_COLUMN_SIZE;
+return 32767;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength()
throw(SQLException, RuntimeException)
{
-return MAX_SQL_IDENTIFIER_SIZE;
+return 32;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex()
throw(SQLException, RuntimeException)
{
// No idea.
// See: http://www.firebirdsql.org/en/firebird-technical-specifications/
-return MAX_INDEX_SEGMENTS;
+return 16;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength()
throw(SQLException, RuntimeException)
{
-return MAX_SQL_IDENTIFIER_SIZE;
+return 32;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException,
RuntimeException)
@@ -166,17 +164,17 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException,
{
// May however be smaller.
// See: http://www.firebirdsql.org/en/firebird-technical-specifications/
-return MAX_COLUMN_SIZE;
+return 32767;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
throw(SQLException, RuntimeException)
{
-return MAX_COLUMN_SIZE;
+return 32767;
}
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength()
throw(SQLException, RuntimeException)
{
-return MAX_SQL_IDENTIFIER_SIZE;
+return 32;
}
// -
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( )
throw(SQLException, RuntimeException)
@@ -697,7 +695,7 @@ sal_Int32 SAL_CALL
ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLExcepti
// -
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( )
throw(SQLException, RuntimeException)
{
-return USERNAME_LENGTH;
+return 31;
}
// -
sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType
) throw(SQLException, RuntimeException)
___
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 0b68d703f557706cf1ac700067aaf51a6acd21ca Author: Rene Engelhard Date: Tue Jul 16 21:50:14 2013 +0200 fix RepositoryExternal.mk for system-firebird Change-Id: Ie8308940bbeb607babaead768407ff6eefcda098 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 860c105..df57e1a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2094,7 +2094,7 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) ifeq ($(SYSTEM_FIREBIRD),YES) -define gb_LinkTarget__use_firebird +define gb_LinkTarget__use_libfbembed $(call gb_LinkTarget_set_include,$(1),\ $(FIREBIRD_CFLAGS) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/firebird/file_firebird.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 165f985703758154971b99cd501f88292cec76f8 Author: Andrzej J.R. Hunt Date: Tue Jul 16 22:08:40 2013 +0200 Fix typo in libfbembed mac installation. Change-Id: Ie233caecb29e16aa82d29b02882ed349e55ee869 diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp index 140d4e7..9391a47 100644 --- a/scp2/source/firebird/file_firebird.scp +++ b/scp2/source/firebird/file_firebird.scp @@ -59,7 +59,7 @@ File gid_File_Firebird_Lib Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX - Name = STRING(CONCAT3(libfbembed,.,UNXSUFFIX)); + Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); #else Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/source
sc/inc/token.hxx|6
sc/source/core/data/documen4.cxx| 52 ++--
sc/source/core/data/formulacell.cxx | 33 +-
sc/source/core/inc/refupdat.hxx |4 --
sc/source/core/tool/rangenam.cxx|6 +++-
sc/source/core/tool/refupdat.cxx| 22 +++
sc/source/core/tool/token.cxx | 24
7 files changed, 57 insertions(+), 90 deletions(-)
New commits:
commit cd82784d337941bc3f5a823b83aa4a77232632d7
Author: Kohei Yoshida
Date: Tue Jul 16 15:42:23 2013 -0400
Remove CalcRelFromAbs() virtual method from ScToken and all its child
classes.
Change-Id: I5def382f6495f332a0309795cbce8ebbd60ff471
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 0839326..b10cbe4 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -74,7 +74,6 @@ public:
virtual const ScSingleRefData&GetSingleRef2() const;
virtual ScSingleRefData& GetSingleRef2();
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual const ScMatrix* GetMatrix() const;
virtual ScMatrix* GetMatrix();
virtual ScJumpMatrix* GetJumpMatrix() const;
@@ -121,7 +120,6 @@ public:
virtual const ScSingleRefData&GetSingleRef() const;
virtual ScSingleRefData& GetSingleRef();
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual booloperator==( const formula::FormulaToken&
rToken ) const;
virtual FormulaToken* Clone() const { return new
ScSingleRefToken(*this); }
@@ -150,7 +148,6 @@ public:
virtual const ScSingleRefData&GetSingleRef2() const;
virtual ScSingleRefData& GetSingleRef2();
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual booloperator==( const formula::FormulaToken&
rToken ) const;
virtual FormulaToken* Clone() const { return new
ScDoubleRefToken(*this); }
@@ -190,7 +187,6 @@ public:
virtual const ScSingleRefData& GetSingleRef() const;
virtual ScSingleRefData& GetSingleRef();
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual booloperator==( const formula::FormulaToken&
rToken ) const;
virtual FormulaToken* Clone() const { return new
ScExternalSingleRefToken(*this); }
};
@@ -218,7 +214,6 @@ public:
virtual const ScComplexRefData&GetDoubleRef() const;
virtual ScComplexRefData& GetDoubleRef();
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual booloperator==( const formula::FormulaToken&
rToken ) const;
virtual FormulaToken* Clone() const { return new
ScExternalDoubleRefToken(*this); }
};
@@ -271,7 +266,6 @@ public:
ScRefListToken( const ScRefListToken & r ) :
ScToken( r ), aRefList( r.aRefList ) {}
virtual voidCalcAbsIfRel( const ScAddress& );
-virtual voidCalcRelFromAbs( const ScAddress& );
virtual const ScRefList*GetRefList() const;
virtual ScRefList*GetRefList();
virtual booloperator==( const formula::FormulaToken&
rToken ) const;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 899aea5..b02334e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2732,7 +2732,6 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea,
SCCOL nGrowX, SCROW nGrowY
{
if( t->GetType() != svIndex )
{
-t->CalcAbsIfRel( aPos );
SingleDoubleRefModifier aMod(*t);
ScComplexRefData& rRef = aMod.Ref();
ScRange aAbs = rRef.toAbs(aPos);
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 250433a..07da54e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -701,11 +701,6 @@ void ScToken::CalcAbsIfRel( const ScAddress& /* rPos */ )
OSL_FAIL( "ScToken::CalcAbsIfRel: virtual dummy called" );
}
-void ScToken::CalcRelFromAbs( const ScAddress& /* rPos */ )
-{
-OSL_FAIL( "ScToken::CalcRelFromAbs: virtual dummy called" );
-}
-
const ScMatrix* ScToken::GetMatrix() const
{
OSL_FAIL( "ScToken::GetMatrix: virtual dummy called" );
@@ -746,8 +741,6 @@ const ScSingleRefData&ScSingleRefToken::GetSingleRef()
const { return aSing
ScSingleRefData& ScSingleRefToken::GetSingleRef(){ return
aSingleRef; }
void
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - a6/09daa146c5588c6a35c2c145e9573c625ec123 db/4affff17f202e69447fd22c246843a6cda3e52
a6/09daa146c5588c6a35c2c145e9573c625ec123 |1 + db/4a17f202e69447fd22c246843a6cda3e52 |1 + 2 files changed, 2 insertions(+) New commits: commit cddd82e622cce163476b10b41e2d4fe354fdd464 Author: Caolán McNamara Date: Tue Jul 16 20:40:55 2013 +0100 Notes added by 'git notes add' diff --git a/db/4a17f202e69447fd22c246843a6cda3e52 b/db/4a17f202e69447fd22c246843a6cda3e52 new file mode 100644 index 000..87fd86e --- /dev/null +++ b/db/4a17f202e69447fd22c246843a6cda3e52 @@ -0,0 +1 @@ +merged as: 7f5faa7f64338b11eda4b033ed9d4cba9833573b commit adfe266b45ec0b3ccefdf1ef109d56213c1ade42 Author: Caolán McNamara Date: Tue Jul 16 20:40:43 2013 +0100 Notes added by 'git notes add' diff --git a/a6/09daa146c5588c6a35c2c145e9573c625ec123 b/a6/09daa146c5588c6a35c2c145e9573c625ec123 new file mode 100644 index 000..943d171 --- /dev/null +++ b/a6/09daa146c5588c6a35c2c145e9573c625ec123 @@ -0,0 +1 @@ +merged as: 199ddc1e5da21a7b012d6a75258b13182b600dd6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source dtrans/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |3 ++-
dtrans/source/win32/dtobj/FetcList.cxx |7 ---
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 199ddc1e5da21a7b012d6a75258b13182b600dd6
Author: Herbert Dürr
Date: Tue Jul 16 13:30:18 2013 +
#i122752# check iterator in each iteration of
CFormatEtcContainer::nextFormatEtc()'s loop
Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator
beyond
the container bounds. The comparable loop in
CFormatEtcContainer::skipFormatEtc()
already checks the iterator against the container end in each iteration.
(cherry picked from commit a609daa146c5588c6a35c2c145e9573c625ec123)
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx
b/dtrans/source/win32/dtobj/FetcList.cxx
index b728850..561f894 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -131,10 +131,11 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc(
LPFORMATETC lpFetc,
sal_uInt32 nFetched = 0;
-if ( m_EnumIterator != m_FormatMap.end( ) )
+for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
{
-for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
-CopyFormatEtc( lpFetc, *m_EnumIterator );
+if ( m_EnumIterator == m_FormatMap.end() )
+break;
+CopyFormatEtc( lpFetc, *m_EnumIterator );
}
return nFetched;
commit 7f5faa7f64338b11eda4b033ed9d4cba9833573b
Author: Armin Le Grand
Date: Tue Jul 16 12:51:14 2013 +
Resolves: #i122758# Initialize Mask with non-transparent
(cherry picked from commit db4a17f202e69447fd22c246843a6cda3e52)
Change-Id: I4851c544b23d2857a0f13cff3ede987ebb813cef
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 86c51b2..5027cb1 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -451,7 +451,8 @@ namespace drawinglayer
#if defined(MACOSX)
const AlphaMask aMaskBmp( aContent.GetSizePixel());
#else
-const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to
non-transparent
#endif
aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
___
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' - f5/6ded7c2aac573e4e5f060892327843eed23d0c
f5/6ded7c2aac573e4e5f060892327843eed23d0c |1 + 1 file changed, 1 insertion(+) New commits: commit 05d2c9fd75559af304bbfe41bc1481f7ff982a8a Author: Caolán McNamara Date: Tue Jul 16 20:38:38 2013 +0100 Notes added by 'git notes add' diff --git a/f5/6ded7c2aac573e4e5f060892327843eed23d0c b/f5/6ded7c2aac573e4e5f060892327843eed23d0c new file mode 100644 index 000..31b5a11 --- /dev/null +++ b/f5/6ded7c2aac573e4e5f060892327843eed23d0c @@ -0,0 +1 @@ +prefer: 980fe99410477f6a4bd0dc935c9e63fa0aad2b0e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/layout.hxx |8
vcl/source/window/layout.cxx |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 98d26079c57c873827beb2d00883547aa558e9a3
Author: Caolán McNamara
Date: Tue Jul 16 20:20:39 2013 +0100
add and use VclExpander::[g|s]et_expanded
Change-Id: I3b4e0947e85a7f6d6533dd17f39542584087c68a
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index f72b93a..041f01b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -516,6 +516,14 @@ public:
virtual Window *get_child();
virtual const Window *get_child() const;
virtual bool set_property(const OString &rKey, const OString &rValue);
+bool get_expanded() const
+{
+return m_aDisclosureButton.IsChecked();
+}
+void set_expanded(bool bExpanded)
+{
+m_aDisclosureButton.Check(bExpanded);
+}
virtual void StateChanged(StateChangedType nType);
protected:
virtual Size calculateRequisition() const;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 462eba1f..0b8dbfa 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1460,7 +1460,7 @@ void VclExpander::setAllocation(const Size &rAllocation)
bool VclExpander::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "expanded")
-m_aDisclosureButton.Check(toBool(rValue));
+set_expanded(toBool(rValue));
else if (rKey == "resize-toplevel")
m_bResizeTopLevel = toBool(rValue);
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit cb82c96f859d6cfc5567b63d17c732fdd6c249b4
Author: Rene Engelhard
Date: Tue Jul 16 21:28:31 2013 +0200
libatomic-ops is only needed for internal firebird, so only check it then...
Change-Id: I8279b70df17071d46e97583a8b40209444c01928
diff --git a/configure.ac b/configure.ac
index b8c5db8..4ee8955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7390,16 +7390,6 @@ dnl
===
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
dnl ===
-dnl Check for system libatomic-ops
-dnl ===
-libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
-if test "$with_system_libatomic_ops" = "yes"; then
- SYSTEM_LIBATOMIC_OPS=YES
-AC_CHECK_HEADERS(atomic_ops.h, [],
- [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
-fi
-
-dnl ===
dnl Check for system libwpd
dnl ===
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 >= 0.9.5 libwpd-stream-0.9
>= 0.9.5],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib
-lwpdlib"])
@@ -8130,6 +8120,16 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
fi
AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS])
else
+ dnl ===
+ dnl Check for system libatomic-ops
+ dnl ===
+ libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >=
0.7.2])
+ if test "$with_system_libatomic_ops" = "yes"; then
+ SYSTEM_LIBATOMIC_OPS=YES
+ AC_CHECK_HEADERS(atomic_ops.h, [],
+ [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)],
[])
+ fi
+
AC_MSG_RESULT([internal])
SYSTEM_FIREBIRD=NO
FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryModule_build.mk
RepositoryModule_build.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 7be71336862204f0763fc2f8cf62a6f48f341114 Author: Matúš Kukan Date: Tue Jul 16 20:46:48 2013 +0200 there is no libfbembed module Change-Id: I9c95b826fb3b48a4430fe9e869b1e3fa45682574 diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index e1f3b8f..65cbd69 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ framework \ harfbuzz \ lcms2 \ - $(call gb_Helper_optional,FIREBIRD,libfbembed) \ linguistic \ nss \ package \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/frame/XStorable.idl|3 +++ offapi/com/sun/star/graphic/XSvgParser.idl |3 +++ 2 files changed, 6 insertions(+) New commits: commit 93180c7231f52d85eb361718f7139c568739a6e2 Author: Norbert Thiebaud Date: Sat Jul 13 17:49:42 2013 -0500 idl add missing param description for XStorage and XSvgParser Change-Id: Id33160c32d38411c5dd5a1a753db2b204865e717 Reviewed-on: https://gerrit.libreoffice.org/4896 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl index ed0427f..73252aa 100644 --- a/offapi/com/sun/star/frame/XStorable.idl +++ b/offapi/com/sun/star/frame/XStorable.idl @@ -131,6 +131,9 @@ published interface XStorable: com::sun::star::uno::XInterface if an IO error occurred during save operation (may the location is unknown) +@param sURL +specifies the location where to store the object + @param lArguments optional parameters for saving (see com::sun::star::document::MediaDescriptor for further details) diff --git a/offapi/com/sun/star/graphic/XSvgParser.idl b/offapi/com/sun/star/graphic/XSvgParser.idl index 4f4e141..89ce23f 100644 --- a/offapi/com/sun/star/graphic/XSvgParser.idl +++ b/offapi/com/sun/star/graphic/XSvgParser.idl @@ -37,6 +37,9 @@ interface XSvgParser : ::com::sun::star::uno::XInterface @param xSvgStream The file containing the SVG XML data + +@param aAbsolutePath +The path containing the SVG XML data */ sequence< XPrimitive2D > getDecomposition( [in] io::XInputStream xSvgStream, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Library_ips.mk filter/source include/tools sot/source sw/inc sw/source tools/Library_tl.mk tools/source
filter/Library_ips.mk |1
filter/source/graphicfilter/ieps/ieps.cxx |6
include/tools/tempfile.hxx| 66 --
sot/source/sdstor/stg.cxx |4
sot/source/sdstor/stgstrms.cxx|4
sw/inc/pch/precompiled_sw.hxx |1
sw/source/ui/uno/unomailmerge.cxx |6
tools/Library_tl.mk |1
tools/source/fsys/tempfile.cxx| 181 --
9 files changed, 11 insertions(+), 259 deletions(-)
New commits:
commit 9c0a390489dd99aee4beaf73845740776b8083aa
Author: Palenik Mihály
Date: Tue Jul 16 16:37:36 2013 +0200
fdo#63133: Write tools/tempfile.hxx out
I deleted TempFile class and changed it to utl::TempFile class
-which in unotools/tempfile.hxx- in the followings: Storage,
StgTmpStrm, SwXMailMerge classes; and RenderAsEMF function.
I modified header in precompiled_sw.hxx.
Change-Id: I3dae5333dc42538e1b905f6a6bbc85534c591dc1
Reviewed-on: https://gerrit.libreoffice.org/4938
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index 2a61795..59933ed 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,ips,\
vcl \
tl \
sal \
+ utl \
$(gb_UWINAPI) \
))
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index e3bf1173..c857b3f 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -33,7 +33,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -189,14 +189,14 @@ static oslProcessError runProcessWithPathSearch(const
OUString &rProgName,
static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic
&rGraphic)
{
-TempFile aTemp;
+utl::TempFile aTemp;
aTemp.EnableKillingFile();
OUString fileName("pstoedit" EXESUFFIX);
OUString arg1("-f");
OUString arg2("emf:-OO");
OUString arg3("-");
OUString output;
-osl::FileBase::getSystemPathFromFileURL(aTemp.GetName(), output);
+osl::FileBase::getSystemPathFromFileURL(aTemp.GetURL(), output);
rtl_uString *args[] =
{
arg1.pData, arg2.pData, arg3.pData, output.pData
diff --git a/include/tools/tempfile.hxx b/include/tools/tempfile.hxx
deleted file mode 100644
index 8d43c18..000
--- a/include/tools/tempfile.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _TOOLS_TEMPFILE_HXX
-#define _TOOLS_TEMPFILE_HXX
-
-#include
-#include "tools/toolsdllapi.h"
-
-struct TempFile_Impl;
-class TOOLS_DLLPUBLIC TempFile
-{
-TempFile_Impl* pImp;
-boolbKillingFileEnabled;
-
-public:
-/** Create a temporary file in the default tempfile folder. */
-TempFile();
-
-/** Create a temporary file in the default tempfile folder; its name starts
-with some given characters followed by a counter ( example:
-rLeadingChars="abc" means "abc0", "abc1" and so on, depending on
-existing files in that folder ).
-
-The extension string may be f.e. ".txt" or "", if no extension string
is
-given, ".tmp" is used.
-*/
-TempFile( const OUString& rLeadingChars, const OUString* pExtension=NULL );
-
-/** TempFile will be removed from disk in dtor if EnableKillingTempFile was
-called before. TempDirs will be removed recursively in that case. */
-~TempFile();
-
-bool IsValid() const;
-
-/** Returns the real name of the tempfile in file URL scheme. */
-OUString GetName() const;
-
-/** If enabled the file will be removed from disk when the dtor is called
-(default is not enabled) */
-void EnableKillingFile( bool bEnable=true ) { bKillingFileEnabled =
bEnable; }
-
-bool IsKillingFileEnabled() const { return bKillingFileEnabled; }
-
-/** Only create a name for a temporary file that would be valid at that
moment. */
-stat
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/formulacell.cxx | 32
sc/source/core/inc/refupdat.hxx |6 ++
sc/source/core/tool/rangenam.cxx|6 +-
sc/source/core/tool/refupdat.cxx| 24 ++--
4 files changed, 33 insertions(+), 35 deletions(-)
New commits:
commit b46ba50bd76ef9f0b861ff50abca2a098cae0578
Author: Kohei Yoshida
Date: Tue Jul 16 14:25:47 2013 -0400
UpdateTranspose() without calling CalcAbsIfRel().
Change-Id: Iddef01a82017ba75c50ed82a54f6ee25fe0df901
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index bf3782e..5b7f8bf 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2631,17 +2631,13 @@ void ScFormulaCell::UpdateTranspose( const ScRange&
rSource, const ScAddress& rD
}
else if( t->GetType() != svIndex )
{
-t->CalcAbsIfRel( aOldPos );
-bool bMod;
-{ // Own scope for SingleDoubleRefModifier dtor if SingleRef
-SingleDoubleRefModifier aMod( *t );
-ScComplexRefData& rRef = aMod.Ref();
-bMod = (ScRefUpdate::UpdateTranspose( pDocument, rSource,
-rDest, rRef ) != UR_NOTHING || bPosChanged);
-}
-if ( bMod )
+SingleDoubleRefModifier aMod(*t);
+ScComplexRefData& rRef = aMod.Ref();
+ScRange aAbs = rRef.toAbs(aOldPos);
+bool bMod = (ScRefUpdate::UpdateTranspose(pDocument, rSource,
rDest, aAbs) != UR_NOTHING || bPosChanged);
+if (bMod)
{
-t->CalcRelFromAbs( aPos );
+rRef.SetRange(aAbs, aPos); // based on the new anchor position.
bRefChanged = true;
}
}
@@ -2658,16 +2654,12 @@ void ScFormulaCell::UpdateTranspose( const ScRange&
rSource, const ScAddress& rD
{
if( t->GetType() != svIndex )
{
-t->CalcAbsIfRel( aOldPos );
-bool bMod;
-{ // Own scope for SingleDoubleRefModifier dtor if SingleRef
-SingleDoubleRefModifier aMod( *t );
-ScComplexRefData& rRef = aMod.Ref();
-bMod = (ScRefUpdate::UpdateTranspose( pDocument, rSource,
-rDest, rRef ) != UR_NOTHING || bPosChanged);
-}
-if ( bMod )
-t->CalcRelFromAbs( aPos );
+SingleDoubleRefModifier aMod(*t);
+ScComplexRefData& rRef = aMod.Ref();
+ScRange aAbs = rRef.toAbs(aOldPos);
+bool bMod = (ScRefUpdate::UpdateTranspose(pDocument, rSource,
rDest, aAbs) != UR_NOTHING || bPosChanged);
+if (bMod)
+rRef.SetRange(aAbs, aPos); // based on the new anchor
position.
}
}
}
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 58b4cc9..a5f688d 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -73,10 +73,8 @@ public:
static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData&
rRef );
-/// Before calling, the absolute references must be up-to-date!
-static ScRefUpdateRes UpdateTranspose( ScDocument* pDoc,
-const ScRange& rSource, const ScAddress& rDest,
-ScComplexRefData& rRef );
+static ScRefUpdateRes UpdateTranspose(
+ScDocument* pDoc, const ScRange& rSource, const ScAddress& rDest,
ScRange& rRef );
static void DoTranspose( SCsCOL& rCol, SCsROW& rRow, SCsTAB& rTab,
ScDocument* pDoc,
const ScRange& rSource, const ScAddress& rDest
);
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 42662ae..75e79ec 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -317,8 +317,12 @@ void ScRangeData::UpdateTranspose( const ScRange& rSource,
const ScAddress& rDes
(!rRef.Ref2.IsColRel() && !rRef.Ref2.IsRowRel() &&
(!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel()
{
-if ( ScRefUpdate::UpdateTranspose( pDoc, rSource, rDest, rRef
) != UR_NOTHING )
+ScRange aAbs = rRef.toAbs(aPos);
+if (ScRefUpdate::UpdateTranspose(pDoc, rSource, rDest, aAbs)
!= UR_NOTHING)
+{
+rRef.SetRange(aAbs, aPos);
bChanged = true;
+}
}
}
}
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 4541768..df0b0a4 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -866,18 +866,22 @@ void ScRefUpdate::DoTranspose(
[Libreoffice-commits] core.git: Branch 'feature/cmis' - 3 commits - ucb/source
ucb/source/ucp/cmis/cmis_content.cxx |6 -
ucb/source/ucp/cmis/cmis_oauth2_providers.hxx |2 -
ucb/source/ucp/cmis/cmis_repo_content.cxx | 30 +++---
ucb/source/ucp/cmis/cmis_url.cxx | 23 +++
4 files changed, 37 insertions(+), 24 deletions(-)
New commits:
commit 9020aef661d87f846b3d436d00a7118b69a45ddc
Author: Cao Cuong Ngo
Date: Tue Jul 16 20:00:56 2013 +0200
CMIS: make GDrive work with path
Change-Id: Ib85be2887219e6067a1b6c227515504020f9a4e7
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 3d35567..9ec04f7 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1452,7 +1452,11 @@ namespace cmis
{
libcmis::Folder* folder = dynamic_cast< libcmis::Folder* >(
pObj.get( ) );
if ( NULL != folder )
-parentPath = folder->getFolderParent( )->getPath( );
+{
+libcmis::FolderPtr parentFolder = folder->getFolderParent(
);
+if ( NULL != parentFolder )
+parentPath = parentFolder->getPath( );
+}
}
}
catch ( const libcmis::Exception & )
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index bbafee5..ac26167 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -35,11 +35,7 @@ namespace cmis
m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET );
// Store the path to the object
-// Google Drive doesn't support getObjectByPath
-if ( m_sBindingUrl == GDRIVE_BASE_URL )
-m_sPath = OUString( );
-else
-m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
+m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET );
if ( !m_sId.isEmpty( ) )
commit b2e7610ca2ff5f7edae3312116e1a04792ac7a16
Author: Cao Cuong Ngo
Date: Tue Jul 16 19:16:44 2013 +0200
CMIS: getRepositories should call createSession
Change-Id: Ia64e15ab53155118dcfdd007a5d76e649bdeded9
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index b2a0196..e0fd7af 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -32,6 +32,7 @@
#include "cmis_provider.hxx"
#include "cmis_repo_content.hxx"
#include "cmis_resultset.hxx"
+#include "cmis_oauth2_providers.hxx"
#define OUSTR_TO_STDSTR(s) string( OUStringToOString( s, RTL_TEXTENCODING_UTF8
).getStr() )
#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ),
RTL_TEXTENCODING_UTF8 )
@@ -142,14 +143,25 @@ namespace cmis
string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) );
if ( authProvider.authenticationQuery( rUsername, rPassword ) )
{
-try
-{
-m_aRepositories = libcmis::SessionFactory::getRepositories(
- OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
rUsername, rPassword );
-}
-catch (const libcmis::Exception&)
-{
-}
+// Create a session to get repositories
+libcmis::OAuth2DataPtr oauth2Data = NULL;
+if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
+oauth2Data.reset( new libcmis::OAuth2Data(
+GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
+GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
+GDRIVE_CLIENT_ID, GDRIVE_CLIENT_SECRET ) );
+
+libcmis::Session* session =
libcmis::SessionFactory::createSession(
+OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
+rUsername, rPassword, "", sal_False, oauth2Data );
+if (session == NULL )
+ucbhelper::cancelCommandExecution(
+ucb::IOErrorCode_INVALID_DEVICE,
+uno::Sequence< uno::Any >( 0 ),
+xEnv,
+OUString( ) );
+m_aRepositories = session->getRepositories( );
+delete session;
}
else
{
@@ -179,6 +191,8 @@ namespace cmis
repo = *it;
}
}
+else
+repo = m_aRepositories.front( );
return repo;
}
commit ae0903a8db71a695483a1801fc72739992be4fe5
Author: Cao Cuong Ngo
Date: Tue Jul 16 16:41:52 2013 +0200
CMIS: the file picker prefer path to ID
Change-Id: I3a8d52411176d29f67340d8b668b8e9cc940d648
diff --git a/ucb/source/ucp/cmis/cmis_oauth2_pr
[Libreoffice-commits] core.git: configure.ac
configure.ac | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) New commits: commit 22adf4e70a4b4a8d188909f39b386e738e3cd37e Author: Andrzej J.R. Hunt Date: Tue Jul 16 18:30:51 2013 +0100 Teach configure about distro-packaged external firebird. Distros seem to omit fb_config when packaging firebird, pkg-config can be used instead. Change-Id: I12e5c5892fcdc5de25835f210ebbb941433f2f44 diff --git a/configure.ac b/configure.ac index a08fafe..b8c5db8 100644 --- a/configure.ac +++ b/configure.ac @@ -8108,21 +8108,26 @@ if test "x$enable_firebird_sdbc" = "xyes"; then SYSTEM_FIREBIRD=YES AC_PATH_PROG(FIREBIRDCONFIG, [fb_config]) if test -z "$FIREBIRDCONFIG"; then -AC_MSG_ERROR([fb_config is missing. Install Firebird package.]) +AC_MSG_NOTICE([No fb_config -- using pkg-config]) +FIREBIRD_VERSION=`pkg-config --modversion fbembed` +AC_MSG_CHECKING([for Firebird Client library]) +FIREBIRD_CFLAGS=`pkg-config --cflags fbembed` +FIREBIRD_LIBS=`pkg-config --libs fbembed` +else +AC_MSG_NOTICE([fb_config found]) +FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` +AC_MSG_CHECKING([for Firebird Client library]) +FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags` +FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs` fi AC_MSG_CHECKING([Firebird version]) -FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` -FIREBIRD_MAJOR=`$FIREBIRDCONFIG --version | cut -d"." -f1` -FIREBIRD_MINOR=`$FIREBIRDCONFIG --version | cut -d"." -f2` +FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` +FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then AC_MSG_RESULT([OK]) else -AC_MSG_ERROR([use 2.5.x]) +AC_MSG_ERROR([Ensure firebird 2.5.x is installed]) fi -AC_MSG_CHECKING([for Firebird Client library]) -FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags` -FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs` -dnl FIREBIRD_LIBS=`$FIREBIRDCONFIG --libs` AC_MSG_RESULT([includes $FIREBIRD_CFLAGS, libraries $FIREBIRD_LIBS]) else AC_MSG_RESULT([internal]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/tool/interpr2.cxx | 43 +++
1 file changed, 21 insertions(+), 22 deletions(-)
New commits:
commit a04935f50ab2f6060b9418f6e9e4c755daffd298
Author: Kohei Yoshida
Date: Tue Jul 16 13:29:21 2013 -0400
Remove CalcAbsIfRel() from ScInterpreter::ScIntersect().
Change-Id: Ifa40c454265e9a08e906038896543e99ce8be638
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a53c6da..e7319c6 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2005,8 +2005,6 @@ void ScInterpreter::ScIntersect()
}
x1 = xt[0], x2 = xt[1];
-x1->CalcAbsIfRel( aPos);
-x2->CalcAbsIfRel( aPos);
ScTokenRef xRes = new ScRefListToken;
ScRefList* pRefList = xRes->GetRefList();
ScRefList::const_iterator end1( x1->GetRefList()->end());
@@ -2014,19 +2012,19 @@ void ScInterpreter::ScIntersect()
for (ScRefList::const_iterator it1( x1->GetRefList()->begin());
it1 != end1; ++it1)
{
-const ScSingleRefData& r11 = (*it1).Ref1;
-const ScSingleRefData& r12 = (*it1).Ref2;
+const ScAddress& r11 = (*it1).Ref1.toAbs(aPos);
+const ScAddress& r12 = (*it1).Ref2.toAbs(aPos);
for (ScRefList::const_iterator it2( x2->GetRefList()->begin());
it2 != end2; ++it2)
{
-const ScSingleRefData& r21 = (*it2).Ref1;
-const ScSingleRefData& r22 = (*it2).Ref2;
-SCCOL nCol1 = ::std::max( r11.nCol, r21.nCol);
-SCROW nRow1 = ::std::max( r11.nRow, r21.nRow);
-SCTAB nTab1 = ::std::max( r11.nTab, r21.nTab);
-SCCOL nCol2 = ::std::min( r12.nCol, r22.nCol);
-SCROW nRow2 = ::std::min( r12.nRow, r22.nRow);
-SCTAB nTab2 = ::std::min( r12.nTab, r22.nTab);
+const ScAddress& r21 = (*it2).Ref1.toAbs(aPos);
+const ScAddress& r22 = (*it2).Ref2.toAbs(aPos);
+SCCOL nCol1 = ::std::max( r11.Col(), r21.Col());
+SCROW nRow1 = ::std::max( r11.Row(), r21.Row());
+SCTAB nTab1 = ::std::max( r11.Tab(), r21.Tab());
+SCCOL nCol2 = ::std::min( r12.Col(), r22.Col());
+SCROW nRow2 = ::std::min( r12.Row(), r22.Row());
+SCTAB nTab2 = ::std::min( r12.Tab(), r22.Tab());
if (nCol2 < nCol1 || nRow2 < nRow1 || nTab2 < nTab1)
; // nothing
else
@@ -2064,19 +2062,19 @@ void ScInterpreter::ScIntersect()
{
case svSingleRef:
case svDoubleRef:
-pt[i]->CalcAbsIfRel( aPos);
+{
{
-const ScSingleRefData& r = pt[i]->GetSingleRef();
-nC1[i] = r.nCol;
-nR1[i] = r.nRow;
-nT1[i] = r.nTab;
+const ScAddress& r = pt[i]->GetSingleRef().toAbs(aPos);
+nC1[i] = r.Col();
+nR1[i] = r.Row();
+nT1[i] = r.Tab();
}
if (sv[i] == svDoubleRef)
{
-const ScSingleRefData& r = pt[i]->GetSingleRef2();
-nC2[i] = r.nCol;
-nR2[i] = r.nRow;
-nT2[i] = r.nTab;
+const ScAddress& r =
pt[i]->GetSingleRef2().toAbs(aPos);
+nC2[i] = r.Col();
+nR2[i] = r.Row();
+nT2[i] = r.Tab();
}
else
{
@@ -2084,7 +2082,8 @@ void ScInterpreter::ScIntersect()
nR2[i] = nR1[i];
nT2[i] = nT1[i];
}
-break;
+}
+break;
default:
; // nothing, prevent compiler warning
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Petr Mladek changed: What|Removed |Added Depends on||66924 --- Comment #49 from Petr Mladek --- Add the bug #66924: unable to edit presentation master pages -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/viewling.cxx | 67 -
sw/source/ui/uiview/viewmdi.cxx | 34 ++--
sw/source/ui/uiview/viewport.cxx | 272 ++-
3 files changed, 170 insertions(+), 203 deletions(-)
New commits:
commit 71c857c774ab07881100a7939e98e3841183ed38
Author: Matthias Freund
Date: Fri Jul 12 20:58:35 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 4)
Change-Id: Ibc235d9a34e3530368b904fa084a66490d789048
Reviewed-on: https://gerrit.libreoffice.org/4873
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index fc497fd..1d2d9fa 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -40,17 +40,17 @@
#include
#include
#include
-#include// fuer SpellPointer
+#include// for SpellPointer
#include
#include
#include
#include
#include // CheckSpellChanges
#include // Viewoptions
-#include// fuer Undo-Ids
-#include // Trennung
-#include// PopupMenu fuer OnlineSpelling
-#include // Spelling: Multiselektion
+#include// for Undo-Ids
+#include // hyphenation
+#include// PopupMenu for OnlineSpelling
+#include // Spelling: Multiselection
#include
#include
#include
@@ -93,9 +93,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::smarttags;
-/*
-Beschreibung: Lingu-Dispatcher
- */
+// Lingu-Dispatcher
+
void SwView::ExecLingu(SfxRequest &rReq)
{
switch(rReq.GetSlot())
@@ -218,9 +217,8 @@ void SwView::ExecLingu(SfxRequest &rReq)
}
}
-/*
-Description: start language specific text conversion
- */
+// start language specific text conversion
+
void SwView::StartTextConversion(
LanguageType nSourceLang,
LanguageType nTargetLang,
@@ -263,9 +261,8 @@ void SwView::StartTextConversion(
SpellKontext(sal_False);
}
-/*
- spellcheck and text conversion related stuff
- */
+// spellcheck and text conversion related stuff
+
void SwView::SpellStart( SvxSpellArea eWhich,
bool bStartDone, bool bEndDone,
SwConversionArgs *pConvArgs )
@@ -324,10 +321,9 @@ void SwView::SpellStart( SvxSpellArea eWhich,
m_pWrtShell->SpellStart( eStart, eEnde, eCurr, pConvArgs );
}
-/*
-Beschreibung: Fehlermeldung beim Spelling
- */
-// Der uebergebene Pointer nLang ist selbst der Wert
+// Error message while Spelling
+
+// The passed pointer nlang is itself the value
void SwView::SpellError(LanguageType eLang)
{
#if OSL_DEBUG_LEVEL > 1
@@ -385,9 +381,8 @@ void SwView::SpellError(LanguageType eLang)
}
-/*
- Beschreibung: Spelling beenden und Cursor wiederherstellen
- */
+// Finish spelling and restore cursor
+
void SwView::SpellEnd( SwConversionArgs *pConvArgs )
{
m_pWrtShell->SpellEnd( pConvArgs );
@@ -416,12 +411,11 @@ void SwView::HyphStart( SvxSpellArea eWhich )
}
}
-/*
- Beschreibung: Interaktive Trennung
- */
+// Interactive separation
+
void SwView::HyphenateDocument()
{
-// do not hyphenate if interactive hyphenationg is active elsewhere
+// do not hyphenate if interactive hyphenation is active elsewhere
if (GetWrtShell().HasHyphIter())
{
MessBox( 0, WB_OK, String( SW_RES( STR_HYPH_TITLE ) ),
@@ -441,7 +435,7 @@ void SwView::HyphenateDocument()
if (m_pWrtShell->GetSelectionType() &
(nsSelectionType::SEL_DRW_TXT|nsSelectionType::SEL_DRW))
{
-// Silbentrennung in einem Draw-Objekt
+// Hyphenation in a Draw object
HyphenateDrawText();
}
else
@@ -453,7 +447,7 @@ void SwView::HyphenateDocument()
Reference< XLinguProperties > xProp( ::GetLinguPropertySet() );
-m_pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig
+m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later
sal_Bool bHyphSpecial = xProp.is() ? x
How to know the current viewed page and line in writer
Hello We would like to implement a new GUI element (for mobile), so to show the current viewed location in writer. For this, we need to know: 1. Which line the writer GUI is currently showing (which may be different from the line the caret / cursor is on - such as when scrolling, for example) 2. How many lines there are in total, in the writer document What is the simplest way to get this information? is it available through UNO, and if not, how can we attain it? Additionally, as a fallback, we would like to simply to know which page writer is showing, and how many pages there are in total. What is the simplest way to get this data? If there are no already existing accessors for this information, can you please direct me to methods and files to hack into or modify to get this data? Thank you in advance Ptyl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentStatistics.hxx |6 --
sw/inc/doc.hxx |7 ---
sw/source/core/doc/doc.cxx | 19 +++
sw/source/ui/uiview/view2.cxx |2 +-
4 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3
Author: Miklos Vajna
Date: Tue Jul 16 18:26:18 2013 +0200
fdo#63273 sw: let word count not update stat. fields
Updating fields would generate loads of selection change events and it's
not what we asked for.
Regression from ce14342c4292628a641a72d4f63d9c048e030c6a.
Change-Id: If237df1f31436357022ca8d77b924681e403abd8
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 2c5a0501..950ea49 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -43,8 +43,9 @@
* modified and returns a reference to the result.
* \param bCompleteAsync if true will return a partial result,
* and potentially trigger a timeout to complete the work.
+ * \param bFields if stat. fields should be updated
*/
-virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync) = 0;
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync, bool
bFields) = 0;
/// Set the document statistics
virtual void SetDocStat(const SwDocStat& rStat) = 0;
@@ -53,8 +54,9 @@
* Updates the internal document's statistics
* \param bCompleteAsync if true it may do part of the
* work and trigger a timeout to complete it.
+ * \param bFields if stat. fields should be updated
*/
-virtual void UpdateDocStat(bool bCompleteAsync) = 0;
+virtual void UpdateDocStat(bool bCompleteAsync, bool bFields) = 0;
protected:
virtual ~IDocumentStatistics() {};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9a6d715..854b869 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -910,9 +910,9 @@ public:
*/
virtual void DocInfoChgd();
virtual const SwDocStat &GetDocStat() const;
-virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false);
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false,
bool bFields = true);
virtual void SetDocStat(const SwDocStat& rStat);
-virtual void UpdateDocStat(bool bCompleteAsync = false);
+virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields =
true);
/** IDocumentState
*/
@@ -2082,10 +2082,11 @@ private:
/** continue computing a chunk of document statistics
* \param nTextNodes number of paragraphs to calculate before
* exiting
+ * \param bFields if stat. fields should be updated
*
* returns false when there is no more to calculate
*/
-bool IncrementalDocStatCalculate(long nTextNodes = 250);
+bool IncrementalDocStatCalculate(long nTextNodes = 250, bool bFields =
true);
/// Our own 'StatsUpdateTimer' calls the following method
DECL_LINK( DoIdleStatsUpdate, Timer * );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 139735d..4840727 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1120,11 +1120,11 @@ const SwDocStat& SwDoc::GetDocStat() const
return *mpDocStat;
}
-const SwDocStat& SwDoc::GetUpdatedDocStat( bool bCompleteAsync )
+const SwDocStat& SwDoc::GetUpdatedDocStat( bool bCompleteAsync, bool bFields )
{
if( mpDocStat->bModified )
{
-UpdateDocStat( bCompleteAsync );
+UpdateDocStat( bCompleteAsync, bFields );
}
return *mpDocStat;
}
@@ -1644,7 +1644,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
// returns true while there is more to do
-bool SwDoc::IncrementalDocStatCalculate( long nTextNodes )
+bool SwDoc::IncrementalDocStatCalculate( long nTextNodes, bool bFields )
{
mpDocStat->Reset();
mpDocStat->nPara = 0; // default is 1!
@@ -1728,8 +1728,11 @@ bool SwDoc::IncrementalDocStatCalculate( long nTextNodes
)
}
// optionally update stat. fields
-SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
-pType->UpdateFlds();
+if (bFields)
+{
+SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
+pType->UpdateFlds();
+}
return nTextNodes <= 0;
}
@@ -1746,16 +1749,16 @@ IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
return 0;
}
-void SwDoc::UpdateDocStat( bool bCompleteAsync )
+void SwDoc::UpdateDocStat( bool bCompleteAsync, bool bFields )
{
if( mpDocStat->bModified )
{
if (!bCompleteAsync)
{
-while (IncrementalDocStatCalculate()) {}
+while (IncrementalDocStatCalculate(250, bFields)) {}
maStatsUpdateTimer.Stop();
}
-else if (IncrementalDocStatCalculate())
+else if (IncrementalDocStatCalculate(250, bFields))
maStatsUpdateTimer.Start();
}
}
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/ui
[Libreoffice-commits] core.git: Library_merged.mk
Library_merged.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 8c9f41f2e6600296e3663c681b3902d2a4d7bbd6 Author: Andrzej J.R. Hunt Date: Tue Jul 16 17:28:09 2013 +0100 libfbfembed shouldn't be part of libmerged. Change-Id: I262b62eb33896c7912685cf3bc78e15b80ce2102 diff --git a/Library_merged.mk b/Library_merged.mk index 7f605ab..26dbb5c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_externals,merged,\ jpeg \ lcms2 \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ - $(call gb_Helper_optional,FIREBIRD,libfbembed) \ liblangtag \ libxml2 \ libxslt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/tool/interpr4.cxx | 140 +++
1 file changed, 70 insertions(+), 70 deletions(-)
New commits:
commit 9e0663d0f0fbe03917669c346604ec46f3e8b532
Author: Kohei Yoshida
Date: Tue Jul 16 12:28:31 2013 -0400
ScColRowNameAuto to avoid calling CalcAbsIfRel.
Change-Id: If0e7797ce33fa183ad95ad539caf7751ce71bad4
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d45cc2a..f55d22f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3619,82 +3619,82 @@ void ScInterpreter::ScColRowNameAuto()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er",
"ScInterpreter::ScColRowNameAuto" );
ScComplexRefData aRefData( static_cast(pCur)->GetDoubleRef() );
-aRefData.CalcAbsIfRel( aPos );
-if ( aRefData.Valid() )
+ScRange aAbs = aRefData.toAbs(aPos);
+if (!ValidRange(aAbs))
{
-SCsCOL nStartCol;
-SCsROW nStartRow;
-SCsCOL nCol2;
-SCsROW nRow2;
-// evtl. Begrenzung durch definierte ColRowNameRanges merken
-nCol2 = aRefData.Ref2.nCol;
-nRow2 = aRefData.Ref2.nRow;
-// DataArea der ersten Zelle
-nStartCol = aRefData.Ref2.nCol = aRefData.Ref1.nCol;
-nStartRow = aRefData.Ref2.nRow = aRefData.Ref1.nRow;
-aRefData.Ref2.nTab = aRefData.Ref1.nTab;
-pDok->GetDataArea( (SCTAB&) aRefData.Ref1.nTab,
-(SCCOL&) aRefData.Ref1.nCol,
-(SCROW&) aRefData.Ref1.nRow,
-(SCCOL&) aRefData.Ref2.nCol,
-(SCROW&) aRefData.Ref2.nRow,
-true, false );
-// DataArea im Ursprung begrenzen
-aRefData.Ref1.nCol = nStartCol;
-aRefData.Ref1.nRow = nStartRow;
-
-//! korrespondiert mit ScCompiler::GetToken
-if ( aRefData.Ref1.IsColRel() )
-{ // ColName
-aRefData.Ref2.nCol = nStartCol;
-// evtl. vorherige Begrenzung durch definierte ColRowNameRanges
erhalten
-if ( aRefData.Ref2.nRow > nRow2 )
-aRefData.Ref2.nRow = nRow2;
-SCROW nMyRow;
-if ( aPos.Col() == nStartCol
- && nStartRow <= (nMyRow = aPos.Row()) && nMyRow <=
aRefData.Ref2.nRow )
-{ // Formel in gleicher Spalte und innerhalb des Range
-if ( nMyRow == nStartRow )
-{ // direkt unter dem Namen den Rest nehmen
-nStartRow++;
-if ( nStartRow > MAXROW )
-nStartRow = MAXROW;
-aRefData.Ref1.nRow = nStartRow;
-}
-else
-{ // weiter unten vom Namen bis zur Formelzelle
-aRefData.Ref2.nRow = nMyRow - 1;
-}
+PushError( errNoRef );
+return;
+}
+
+SCsCOL nStartCol;
+SCsROW nStartRow;
+
+// evtl. Begrenzung durch definierte ColRowNameRanges merken
+SCsCOL nCol2 = aAbs.aEnd.Col();
+SCsROW nRow2 = aAbs.aEnd.Row();
+// DataArea of the first cell
+nStartCol = aAbs.aStart.Col();
+nStartRow = aAbs.aStart.Row();
+aAbs.aEnd = aAbs.aStart; // Shrink to the top-left cell.
+
+{
+// Expand to the data area. Only modify the end position.
+SCCOL nDACol1 = aAbs.aStart.Col(), nDACol2 = aAbs.aEnd.Col();
+SCROW nDARow1 = aAbs.aStart.Row(), nDARow2 = aAbs.aEnd.Row();
+pDok->GetDataArea(aAbs.aStart.Tab(), nDACol1, nDARow1, nDACol2,
nDARow2, true, false);
+aAbs.aEnd.SetCol(nDACol2);
+aAbs.aEnd.SetRow(nDARow2);
+}
+
+//! korrespondiert mit ScCompiler::GetToken
+if ( aRefData.Ref1.IsColRel() )
+{ // ColName
+aAbs.aEnd.SetCol(nStartCol);
+// evtl. vorherige Begrenzung durch definierte ColRowNameRanges
erhalten
+if (aAbs.aEnd.Row() > nRow2)
+aAbs.aEnd.SetRow(nRow2);
+SCROW nMyRow;
+if ( aPos.Col() == nStartCol
+ && nStartRow <= (nMyRow = aPos.Row()) && nMyRow <= aAbs.aEnd.Row())
+{ // Formel in gleicher Spalte und innerhalb des Range
+if ( nMyRow == nStartRow )
+{ // direkt unter dem Namen den Rest nehmen
+nStartRow++;
+if ( nStartRow > MAXROW )
+nStartRow = MAXROW;
+aAbs.aStart.SetRow(nStartRow);
}
-}
-else
-{ // RowName
-aRefData.Ref2.nRow = nStartRow;
-// evtl. vorherige Begrenzung durch definierte ColRowNameRanges
erhalten
-if ( aRefData.Ref2.nCol > nCol2 )
-aRefData.Ref2.nCol = nCol2;
-SCCOL nMyCol;
-if ( aPos.Row() == nStartRow
- && nStartCol <= (nMyCol = aPos.Col()) && nMyCol <=
aRefData.Ref2.nCol )
-{ // Formel in gleicher Zeile und innerhalb des Range
-if (
[Libreoffice-commits] core.git: sw/source
sw/source/core/fields/reffld.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 1bbe69acfcc401a0686feefe91c34e68a50b0d2c
Author: Michael Stahl
Date: Tue Jul 16 18:20:22 2013 +0200
SwGetRefField::PutValue: unused variable sTmp
Change-Id: I94cc8455d054d6d43a5445d3434b1d8ef57c05c7
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 7bdcc0c..486f965 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -668,7 +668,6 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16
nWhichId ) const
bool SwGetRefField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
-String sTmp;
switch( nWhichId )
{
case FIELD_PROP_USHORT1:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [solved] sysui CustomTarget_solaris.mk not working
Forgot: I also had to patch Module_sysui.mk Pushed Package_share and Package_desktop at the end of the list, and created an if clause for slackware: $(eval $(call gb_Module_add_targets,sysui,\ CustomTarget_share \ $(if $(filter SLACKWARE,$(OS)),CustomTarget_slackware) \ $(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ Package_share \ Package_desktop \ )) This to: - let share and desktop be built after target solaris, or the tar.gz would be missing - don't build slackware stuff if not needed Gabriele. Da: Gabriele Bulfon A: libreoffice-dev Data: 16 luglio 2013 17.47.31 CEST Oggetto: Re: [solved] sysui CustomTarget_solaris.mk not working I found the reason: the solaris taget mk has errors, and a misterious bug. 1. $(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/prototype there's an error here, mailcap should be prototype, the mailcap target is already defined before correctly. 2. $(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/copyright $(solaris_WORKDIR)/pkginfo $(solaris_WORKDIR)/depend $(solaris_WORKDIR)/mailcap $(solaris_WORKDIR)/postinstall $(solaris_WORKDIR)/postremove $(solaris_WORKDIR)/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml the code under this rule is never executed, probably because of the previous mispelling, but also because probably the openoffice.org.xml does not exists. I tried removing the dependencies one by one, but misteriously the dependencies were executed, but the tar.gz code was never executed after. By doing gmake --debug=v, I could see that gmake was taking into consideration the target of the tar.gz, but at the end it was only saying "target done", without executing its code. The only way I could force execution of the code to build the tar.gz, was to take away all the dependencies, like this: $(solaris_WORKDIR)/%-desktop-integration.tar.gz: pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*) $(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip$@ Also, pkgmk fails, something is missing, so I just commented it because I don't need old style packages. If you need the patch files, I have them. Gabriele. Da: Gabriele Bulfon A: libreoffice-dev Data: 16 luglio 2013 13.30.26 CEST Oggetto: sysui CustomTarget_solaris.mk not working During install create phase, the sysui CustomaTarget_solaris.mk rule to create the desktop integration tar.gz is never invoked: $(solaris_WORKDIR)/%-desktop-integration.tar.gz: .. So build fails when trying to cp this file later. I tried to debug the problem but I still cannot figure out why that rule is never invoked. Also, I cannot understand why the Module_sysui.mk always runs slackware even when not building for slackware: $(eval $(call gb_Module_add_targets,sysui,\ CustomTarget_share \ CustomTarget_slackware \ Package_share \ Package_desktop \ $(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) other targets are considered, while slackware is always built. thanks for any help! Gabriele. ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/swuiidxmrk.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 802b66092c441065278a879efb5da24fab08a31b
Author: Michael Stahl
Date: Tue Jul 16 17:48:04 2013 +0200
warning C4805 unsafe mix of type sal_Bool and type bool
Change-Id: I2d65386fb697cbd62768cbcc565611d9a5fdb068
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index 6b86732..c754910 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1232,7 +1232,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
//insert or update the SwAuthorityField...
if(pSh)
{
-sal_Bool bDifferent = sal_False;
+bool bDifferent = false;
OSL_ENSURE(m_sFields[AUTH_FIELD_IDENTIFIER].Len() , "No Id is set!");
OSL_ENSURE(m_sFields[AUTH_FIELD_AUTHORITY_TYPE].Len() , "No authority
type is set!");
//check if the entry already exists with different content
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/coretext
vcl/coretext/ctlayout.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 48bcea3710f14091e2e4fd078a31f278bce0c196
Author: Khaled Hosny
Date: Mon Jul 15 11:32:30 2013 +0200
fdo#66577: Cursor displaced in Web Layout
Using lrint() helps a bit, but does not fix the issue entirely.
Change-Id: Ib80e2c5a57d632f289e49322d3712c6321ae1ec2
Reviewed-on: https://gerrit.libreoffice.org/4907
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index 632d6f5..437f7fc 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -341,7 +341,7 @@ int CTLayout::GetNextGlyphs( int nLen, sal_GlyphId*
pGlyphIDs, Point& rPos, int&
// convert glyph details for VCL
*(pGlyphIDs++) = pCGGlyphIdx[ nSubIndex ];
if( pGlyphAdvances )
-*(pGlyphAdvances++) = pCGGlyphAdvs[ nSubIndex ].width;
+*(pGlyphAdvances++) = lrint(pCGGlyphAdvs[ nSubIndex ].width);
if( pCharIndexes )
*(pCharIndexes++) = pCGGlyphStrIdx[ nSubIndex] + mnMinCharPos;
if( pFallbackFonts )
@@ -406,7 +406,7 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
CTRunGetStringIndices( pGlyphRun, aFullRange, &aIndexVec[0] );
for( int i = 0; i != nGlyphCount; ++i ) {
const int nRelIdx = aIndexVec[i];
-pDXArray[ nRelIdx ] += aSizeVec[i].width;
+pDXArray[ nRelIdx ] += lrint(aSizeVec[i].width);
}
}
}
@@ -500,10 +500,10 @@ bool CTLayout::GetBoundRect( SalGraphics& rGraphics,
Rectangle& rVCLRect ) const
CGContextRestoreGState( rAquaGraphics.mrContext );
-rVCLRect.Left() = aVclPos.x + aMacRect.origin.x;
-rVCLRect.Right() = aVclPos.x + (aMacRect.origin.x + aMacRect.size.width);
-rVCLRect.Bottom() = aVclPos.x - (aMacRect.origin.y);
-rVCLRect.Top()= aVclPos.x - (aMacRect.origin.y + aMacRect.size.height);
+rVCLRect.Left() = aVclPos.x + lrint(aMacRect.origin.x);
+rVCLRect.Right() = aVclPos.x + lrint(aMacRect.origin.x +
aMacRect.size.width);
+rVCLRect.Bottom() = aVclPos.x - lrint(aMacRect.origin.y);
+rVCLRect.Top()= aVclPos.x - lrint(aMacRect.origin.y +
aMacRect.size.height);
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |6 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 1d9a5ff666e0b458af58e337eddb81da670c6834
Author: Petr Mladek
Date: Tue Jul 16 16:45:31 2013 +0200
fix build with system poppler-0.23.0
XRef *xref parameter has been added to the OutputDev::startPage method, see
http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499
Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db
Reviewed-on: https://gerrit.libreoffice.org/4939
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 4ee6a59..9d9b841 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev()
delete m_pUtf8Map;
}
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef* /*xref*/
+#endif
+)
{
assert(state);
printf("startPage %f %f\n",
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 2daa5b8..12ae281 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -178,7 +178,11 @@ namespace pdfi
virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
// Start a page.
-virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
+virtual void startPage(int pageNum, GfxState *state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef *xref
+#endif
+) SAL_OVERRIDE;
// End a page.
virtual void endPage() SAL_OVERRIDE;
___
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' - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |6 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit a7688eff345133147984507c35bf444131cc3d63
Author: Petr Mladek
Date: Tue Jul 16 16:45:31 2013 +0200
fix build with system poppler-0.23.0
XRef *xref parameter has been added to the OutputDev::startPage method, see
http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499
Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db
Reviewed-on: https://gerrit.libreoffice.org/4940
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 03adf89..53a77d3 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
{
}
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef* /*xref*/
+#endif
+)
{
assert(state);
printf("startPage %f %f\n",
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index c0977cb7..4f3d3a9 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -181,7 +181,11 @@ namespace pdfi
virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
// Start a page.
-virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
+virtual void startPage(int pageNum, GfxState *state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef *xref
+#endif
+) SAL_OVERRIDE;
// End a page.
virtual void endPage() SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [solved] sysui CustomTarget_solaris.mk not working
I found the reason: the solaris taget mk has errors, and a misterious bug. 1. $(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/prototype there's an error here, mailcap should be prototype, the mailcap target is already defined before correctly. 2. $(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/copyright $(solaris_WORKDIR)/pkginfo $(solaris_WORKDIR)/depend $(solaris_WORKDIR)/mailcap $(solaris_WORKDIR)/postinstall $(solaris_WORKDIR)/postremove $(solaris_WORKDIR)/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml the code under this rule is never executed, probably because of the previous mispelling, but also because probably the openoffice.org.xml does not exists. I tried removing the dependencies one by one, but misteriously the dependencies were executed, but the tar.gz code was never executed after. By doing gmake --debug=v, I could see that gmake was taking into consideration the target of the tar.gz, but at the end it was only saying "target done", without executing its code. The only way I could force execution of the code to build the tar.gz, was to take away all the dependencies, like this: $(solaris_WORKDIR)/%-desktop-integration.tar.gz: pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*) $(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip$@ Also, pkgmk fails, something is missing, so I just commented it because I don't need old style packages. If you need the patch files, I have them. Gabriele. Da: Gabriele Bulfon A: libreoffice-dev Data: 16 luglio 2013 13.30.26 CEST Oggetto: sysui CustomTarget_solaris.mk not working During install create phase, the sysui CustomaTarget_solaris.mk rule to create the desktop integration tar.gz is never invoked: $(solaris_WORKDIR)/%-desktop-integration.tar.gz: .. So build fails when trying to cp this file later. I tried to debug the problem but I still cannot figure out why that rule is never invoked. Also, I cannot understand why the Module_sysui.mk always runs slackware even when not building for slackware: $(eval $(call gb_Module_add_targets,sysui,\ CustomTarget_share \ CustomTarget_slackware \ Package_share \ Package_desktop \ $(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) other targets are considered, while slackware is always built. thanks for any help! Gabriele. ___LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://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 'libreoffice-4-0' - shell/inc shell/source
shell/inc/internal/stream_helper.hxx |4 ++--
shell/inc/internal/types.hxx |2 +-
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit f7ff371fdc4c44820a1cfae90c2f1af704f276a2
Author: Fridrich Å trba
Date: Tue Jul 16 17:13:14 2013 +0200
bnc#829017 fix issue with negative seeks in win32 shell extension
Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
(cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c)
Reviewed-on: https://gerrit.libreoffice.org/4942
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/shell/inc/internal/stream_helper.hxx
b/shell/inc/internal/stream_helper.hxx
index 77af988..a7a48ab 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@ public:
~BufferStream();
unsigned long sread (unsigned char *vuf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
IStream *stream;
};
@@ -43,7 +43,7 @@ public:
~FileStream();
unsigned long sread (unsigned char *buf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
FILE *file;
};
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 15a03ca..8fc66d9 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -78,7 +78,7 @@ public:
virtual ~StreamInterface() {}
virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
virtual long stell () = 0;
-virtual long sseek (unsigned long offset, int origin) = 0;
+virtual long sseek (long offset, int origin) = 0;
};
#endif
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 4f78900..3b77d28 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -74,7 +74,7 @@ long BufferStream::stell ()
return -1;
}
-long BufferStream::sseek (unsigned long offset, int origin)
+long BufferStream::sseek (long offset, int origin)
{
HRESULT hr;
LARGE_INTEGER Move;
@@ -129,7 +129,7 @@ long FileStream::stell ()
return -1L;
}
-long FileStream::sseek (unsigned long offset, int origin)
+long FileStream::sseek (long offset, int origin)
{
if (file)
return fseek(file, offset, origin);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - shell/inc shell/source
shell/inc/internal/stream_helper.hxx |4 ++--
shell/inc/internal/types.hxx |2 +-
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 57cc8bcb701de4291be5ed4c4b2de57eef049730
Author: Fridrich Å trba
Date: Tue Jul 16 17:13:14 2013 +0200
bnc#829017 fix issue with negative seeks in win32 shell extension
Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
(cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c)
Reviewed-on: https://gerrit.libreoffice.org/4941
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/shell/inc/internal/stream_helper.hxx
b/shell/inc/internal/stream_helper.hxx
index 77af988..a7a48ab 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@ public:
~BufferStream();
unsigned long sread (unsigned char *vuf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
IStream *stream;
};
@@ -43,7 +43,7 @@ public:
~FileStream();
unsigned long sread (unsigned char *buf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
FILE *file;
};
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 15a03ca..8fc66d9 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -78,7 +78,7 @@ public:
virtual ~StreamInterface() {}
virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
virtual long stell () = 0;
-virtual long sseek (unsigned long offset, int origin) = 0;
+virtual long sseek (long offset, int origin) = 0;
};
#endif
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 4f78900..3b77d28 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -74,7 +74,7 @@ long BufferStream::stell ()
return -1;
}
-long BufferStream::sseek (unsigned long offset, int origin)
+long BufferStream::sseek (long offset, int origin)
{
HRESULT hr;
LARGE_INTEGER Move;
@@ -129,7 +129,7 @@ long FileStream::stell ()
return -1L;
}
-long FileStream::sseek (unsigned long offset, int origin)
+long FileStream::sseek (long offset, int origin)
{
if (file)
return fseek(file, offset, origin);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/qa sc/source
sc/inc/refdata.hxx |1
sc/inc/reftokenhelper.hxx |2 -
sc/qa/unit/ucalc.cxx | 23 --
sc/source/core/data/formulacell.cxx|9 +
sc/source/core/tool/compiler.cxx | 27 +++--
sc/source/core/tool/detfunc.cxx|5 +--
sc/source/core/tool/refdata.cxx|6 +++
sc/source/core/tool/reftokenhelper.cxx | 51 +++--
sc/source/filter/excel/xichart.cxx |2 -
sc/source/ui/unoobj/chart2uno.cxx | 22 +++---
10 files changed, 85 insertions(+), 63 deletions(-)
New commits:
commit 40c7aec3d3ef6ce76857b02c3d68fb24f1831414
Author: Kohei Yoshida
Date: Tue Jul 16 11:37:22 2013 -0400
More on this.
Change-Id: I9571c903c11e92984ac29818c68d66c2fd9c30d2
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 74028ac..77d03e6d 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -167,6 +167,7 @@ struct ScComplexRefData
inline bool ValidExternal() const;
SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
+void SetRange( const ScRange& rRange, const ScAddress& rPos );
/// Absolute references have to be up-to-date when calling this!
void PutInOrder();
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index d7cfa8e..cd1c9e8 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -62,7 +62,7 @@ public:
static bool SC_DLLPUBLIC intersects(
const ::std::vector& rTokens, const ScTokenRef& pToken,
const ScAddress& rPos);
-static void SC_DLLPUBLIC join(::std::vector& rTokens, const
ScTokenRef& pToken);
+static void SC_DLLPUBLIC join(::std::vector& rTokens, const
ScTokenRef& pToken, const ScAddress& rPos);
static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const
ScTokenRef& pToken);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fb34ca3..adecc55 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3176,7 +3176,7 @@ void Test::testFormulaPosition()
namespace {
-bool hasRange(const std::vector& rRefTokens, const ScRange& rRange)
+bool hasRange(const std::vector& rRefTokens, const ScRange&
rRange, const ScAddress& rPos)
{
std::vector::const_iterator it = rRefTokens.begin(), itEnd =
rRefTokens.end();
for (; it != itEnd; ++it)
@@ -3193,7 +3193,7 @@ bool hasRange(const std::vector& rRefTokens,
const ScRange& rRange)
if (rRange.aStart != rRange.aEnd)
break;
-ScAddress aThis(aData.nCol, aData.nRow, aData.nTab);
+ScAddress aThis = aData.toAbs(rPos);
if (aThis == rRange.aStart)
return true;
}
@@ -3201,7 +3201,7 @@ bool hasRange(const std::vector& rRefTokens,
const ScRange& rRange)
case formula::svDoubleRef:
{
ScComplexRefData aData = p->GetDoubleRef();
-ScRange aThis(aData.Ref1.nCol, aData.Ref1.nRow,
aData.Ref1.nTab, aData.Ref2.nCol, aData.Ref2.nRow, aData.Ref2.nTab);
+ScRange aThis = aData.toAbs(rPos);
if (aThis == rRange)
return true;
}
@@ -3230,30 +3230,33 @@ void Test::testJumpToPrecedentsDependents()
{
// C1's precedent should be A1:A2,B3.
-ScRangeList aRange(ScRange(2, 0, 0));
+ScAddress aC1(2, 0, 0);
+ScRangeList aRange(aC1);
rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
CPPUNIT_ASSERT_MESSAGE("A1:A2 should be a precedent of C1.",
- hasRange(aRefTokens, ScRange(0, 0, 0, 0, 1,
0)));
+ hasRange(aRefTokens, ScRange(0, 0, 0, 0, 1, 0),
aC1));
CPPUNIT_ASSERT_MESSAGE("B3 should be a precedent of C1.",
- hasRange(aRefTokens, ScRange(1, 2, 0)));
+ hasRange(aRefTokens, ScRange(1, 2, 0), aC1));
}
{
// C2's precedent should be A1 only.
-ScRangeList aRange(ScRange(2, 1, 0));
+ScAddress aC2(2, 1, 0);
+ScRangeList aRange(aC2);
rDocFunc.DetectiveCollectAllPreds(aRange, aRefTokens);
CPPUNIT_ASSERT_EQUAL_MESSAGE("there should only be one reference
token.",
aRefTokens.size(), static_cast(1));
CPPUNIT_ASSERT_MESSAGE("A1 should be a precedent of C1.",
- hasRange(aRefTokens, ScRange(0, 0, 0)));
+ hasRange(aRefTokens, ScRange(0, 0, 0), aC2));
}
{
// A1's dependent should be C1:C2.
-ScRangeList aRange(ScRange(0, 0, 0));
+ScAddress aA1(0, 0, 0);
+ScRangeList aRange(aA1);
rDocFunc.DetectiveCollectAllSuccs(aRange, aRefTokens);
CPPUNIT_ASSERT_MESSAGE("C1:C2 should be the only dependent of A1.",
- aRefTokens.size() =
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - shell/inc shell/source
shell/inc/internal/stream_helper.hxx |4 ++--
shell/inc/internal/types.hxx |2 +-
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 5dc53b8440e67867669e3814354890deb2f8da32
Author: Fridrich Å trba
Date: Tue Jul 16 17:13:14 2013 +0200
bnc#829017 fix issue with negative seeks in win32 shell extension
Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
(cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c)
diff --git a/shell/inc/internal/stream_helper.hxx
b/shell/inc/internal/stream_helper.hxx
index 77af988..a7a48ab 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@ public:
~BufferStream();
unsigned long sread (unsigned char *vuf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
IStream *stream;
};
@@ -43,7 +43,7 @@ public:
~FileStream();
unsigned long sread (unsigned char *buf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
FILE *file;
};
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 15a03ca..8fc66d9 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -78,7 +78,7 @@ public:
virtual ~StreamInterface() {}
virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
virtual long stell () = 0;
-virtual long sseek (unsigned long offset, int origin) = 0;
+virtual long sseek (long offset, int origin) = 0;
};
#endif
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 4f78900..3b77d28 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -74,7 +74,7 @@ long BufferStream::stell ()
return -1;
}
-long BufferStream::sseek (unsigned long offset, int origin)
+long BufferStream::sseek (long offset, int origin)
{
HRESULT hr;
LARGE_INTEGER Move;
@@ -129,7 +129,7 @@ long FileStream::stell ()
return -1L;
}
-long FileStream::sseek (unsigned long offset, int origin)
+long FileStream::sseek (long offset, int origin)
{
if (file)
return fseek(file, offset, origin);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC]Use Widget Layout for the Start Center Weekly Update 04
Hi all! Since my last update I have been working on writing a custom widget for displaying thumbnails for recent documents. All the recent docs loading functionality will be in this widget, so it won't clutter the code for BackingWindow. I'm getting close to finishing it, I hope to do so this week. All the best, Krisztian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Library_merged.mk
Library_merged.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1 Author: Andrzej J.R. Hunt Date: Tue Jul 16 17:07:07 2013 +0200 Fix firebird with libmerged. Change-Id: I2784700686981c3eb487daae00b9f537658771bd diff --git a/Library_merged.mk b/Library_merged.mk index 439f437..7f605ab 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -47,8 +47,8 @@ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ jpeg \ lcms2 \ - libatomic_ops \ - libfbembed \ + $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ + $(call gb_Helper_optional,FIREBIRD,libfbembed) \ liblangtag \ libxml2 \ libxslt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/inc shell/source
shell/inc/internal/stream_helper.hxx |4 ++--
shell/inc/internal/types.hxx |2 +-
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c
Author: Fridrich Å trba
Date: Tue Jul 16 17:13:14 2013 +0200
bnc#829017 fix issue with negative seeks in win32 shell extension
Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
diff --git a/shell/inc/internal/stream_helper.hxx
b/shell/inc/internal/stream_helper.hxx
index 77af988..a7a48ab 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
@@ -31,7 +31,7 @@ public:
~BufferStream();
unsigned long sread (unsigned char *vuf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
IStream *stream;
};
@@ -43,7 +43,7 @@ public:
~FileStream();
unsigned long sread (unsigned char *buf, unsigned long size);
long stell ();
-long sseek (unsigned long offset, int origin);
+long sseek (long offset, int origin);
private:
FILE *file;
};
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 15a03ca..8fc66d9 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -78,7 +78,7 @@ public:
virtual ~StreamInterface() {}
virtual unsigned long sread (unsigned char* vuf, unsigned long size) = 0;
virtual long stell () = 0;
-virtual long sseek (unsigned long offset, int origin) = 0;
+virtual long sseek (long offset, int origin) = 0;
};
#endif
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 4f78900..3b77d28 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -74,7 +74,7 @@ long BufferStream::stell ()
return -1;
}
-long BufferStream::sseek (unsigned long offset, int origin)
+long BufferStream::sseek (long offset, int origin)
{
HRESULT hr;
LARGE_INTEGER Move;
@@ -129,7 +129,7 @@ long FileStream::stell ()
return -1L;
}
-long FileStream::sseek (unsigned long offset, int origin)
+long FileStream::sseek (long offset, int origin)
{
if (file)
return fseek(file, offset, origin);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryModule_build.mk
RepositoryModule_build.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f195b9b14a872d0bd1dc62a781a4ba8c197f697 Author: Andrzej J.R. Hunt Date: Tue Jul 16 16:49:36 2013 +0200 libfbembed depends on firebird being enabled. Change-Id: Id2b9891fda5755440b13fa7401db3c988b5e0be5 diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 7af89f9..e1f3b8f 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -73,7 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ framework \ harfbuzz \ lcms2 \ - libfbembed \ + $(call gb_Helper_optional,FIREBIRD,libfbembed) \ linguistic \ nss \ package \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_r...
Michael Stahl has uploaded a new patch set (#4). Change subject: gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule .. gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 --- M crashrep/CustomTarget_crashrep_res.mk M instsetoo_native/CustomTarget_install.mk M setup_native/CustomTarget_mac.mk M shell/CustomTarget_shlxthdl_res.mk M solenv/gbuild/CustomTarget.mk M solenv/gbuild/Gallery.mk M solenv/gbuild/InstallModuleTarget.mk M sysui/CustomTarget_infoplist.mk M sysui/CustomTarget_share.mk M sysui/Module_sysui.mk 10 files changed, 72 insertions(+), 92 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4937/4 -- To view, visit https://gerrit.libreoffice.org/4937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_r...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4937 -- To view, visit https://gerrit.libreoffice.org/4937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: crashrep/CustomTarget_crashrep_res.mk instsetoo_native/CustomTarget_install.mk setup_native/CustomTarget_mac.mk shell/CustomTarget_shlxthdl_res.mk solenv/gbuild sysui/C
crashrep/CustomTarget_crashrep_res.mk| 12 +---
instsetoo_native/CustomTarget_install.mk | 23 +++
setup_native/CustomTarget_mac.mk | 18 +-
shell/CustomTarget_shlxthdl_res.mk | 12 +---
solenv/gbuild/CustomTarget.mk| 27 +++
solenv/gbuild/Gallery.mk | 23 ++-
solenv/gbuild/InstallModuleTarget.mk | 21 -
sysui/CustomTarget_infoplist.mk |9 -
sysui/CustomTarget_share.mk | 17 +
sysui/Module_sysui.mk|2 --
10 files changed, 72 insertions(+), 92 deletions(-)
New commits:
commit 85c7e212a26b24883b9a001b6529efeb80955809
Author: Michael Stahl
Date: Tue Jul 16 14:54:04 2013 +0200
gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
diff --git a/crashrep/CustomTarget_crashrep_res.mk
b/crashrep/CustomTarget_crashrep_res.mk
index be6c688..46d1016 100644
--- a/crashrep/CustomTarget_crashrep_res.mk
+++ b/crashrep/CustomTarget_crashrep_res.mk
@@ -33,12 +33,10 @@ $(call
gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc :
-rch rcheader.txt \
-rcf rcfooter.txt)
-$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \
- $(SRCDIR)/crashrep/source/win32/crashrep.ulf \
- $(call gb_Executable_get_runtime_dependencies,ulfex)
- MERGEINPUT=`$(gb_MKTEMP)` && \
- echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst
$(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
- $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT}
-l all && \
- rm -f $${MERGEINPUT}
+$(eval $(call gb_CustomTarget_ulfex_rule,\
+ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf,\
+ $(SRCDIR)/crashrep/source/win32/crashrep.ulf,\
+ $(foreach lang,$(gb_TRANS_LANGS),\
+ $(gb_POLOCATION)/$(lang)/crashrep/source/win32.po)))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 573b9c6..e3a52f2 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -35,23 +35,14 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%
cat $< | tr -d "\015" > $@
chmod a+x $@
-ifneq ($(WITH_LANG),)
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
-
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \
- $(call gb_Executable_get_runtime_dependencies,ulfex) \
- $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
- $(call gb_Output_announce,$@,$(true),SUM,1)
- MERGEINPUT=`$(gb_MKTEMP)` && \
- echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)
> $${MERGEINPUT} && \
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_command,ulfex) -i $< -o $@ -m $${MERGEINPUT}
-l all ) && \
- rm -rf $${MERGEINPUT}
-else
-$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
-
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf \
- $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
- cp $< $@
-endif
+ | $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
+
+$(eval $(call gb_CustomTarget_ulfex_rule,\
+ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf,\
+ $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf,\
+ $(foreach lang,$(gb_TRANS_LANGS),\
+
$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)))
export ENABLE_DOWNLOADSETS ?= TRUE
ifeq ($(OS),LINUX)
diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index d3b171b..2f35f23 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -11,18 +11,10 @@ $(eval $(call
gb_CustomTarget_CustomTarget,setup_native/mac))
$(eval $(call gb_CustomTarget_register_target,setup_native/mac,macinstall.ulf))
-#FIXME: generalize rule? ripped off from ScpMergeTarget
-ifneq ($(WITH_LANG),)
-$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf:
$(SRCDIR)/setup_native/source/mac/macinstall.ulf | $(call
gb_Executable_get_runtime_dependencies,ulfex)
- $(call gb_Output_announce,$@,$(true),SUM,1)
- MERGEINPUT=`$(gb_MKTEMP)` && \
- echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po) >
$${MERGEINPUT} && \
- $(call gb_Helper_ab
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/ChangeLog |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 2bbf5d5bcffd2218f6b48fdfa4965735cbd4dd68 Author: László Németh Date: Tue Jul 16 16:47:07 2013 +0200 fix misleading typos in librelogo/changelog Change-Id: If6adf5c46b6fbdb9ae051c11125fb9fb690acf7b diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog index e056c19..9a9af0c 100644 --- a/librelogo/source/ChangeLog +++ b/librelogo/source/ChangeLog @@ -1,9 +1,9 @@ 2013-07-15 László Németh: -* optional named PICTURE blocks: PICTURE "name" [ CIRCLE 5 ] +* optional named PICTURE blocks: PICTURE 'name' [ CIRCLE 5 ] * save PICTURE as cropped SVG file using path names, for example: - PICTURE "example.svg" [ CIRCLE 5 CIRCLE 20 ] ; save in the home directory - PICTURE "/home/user/example.svg" [ CIRCLE 10 ] ; absolute path (on Linux) - PICTURE "tmp/example.svg" [ CIRCLE 10 ] ; relative to the home directory + PICTURE 'example.svg' [ CIRCLE 5 CIRCLE 20 ] ; save in the home directory + PICTURE '/home/user/example.svg' [ CIRCLE 10 ] ; absolute path (on Linux) + PICTURE 'tmp/example.svg' [ CIRCLE 10 ] ; relative to the home directory * support hexadecimal arguments 2013-06-26 László Németh ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 646d6e9fa9440a33866567f7f80eea1798c506b9 Author: Christian Lohmaier Date: Tue Jul 16 16:36:57 2013 +0200 bump product version to 4.1.0.3.0+ Change-Id: I032b5cd2f807fb399a00de2509c3c4f667f2505c diff --git a/configure.ac b/configure.ac index df40096..2fa4abf 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.0.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.0.3.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |6 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 828ebc542b980fce90e70459eb2d13e6eeecc355
Author: Petr Mladek
Date: Tue Jul 16 16:45:31 2013 +0200
fix build with system poppler-0.23.0
XRef *xref parameter has been added to the OutputDev::startPage method, see
http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499
Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 4ee6a59..9d9b841 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev()
delete m_pUtf8Map;
}
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef* /*xref*/
+#endif
+)
{
assert(state);
printf("startPage %f %f\n",
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index db80221..4fff4b9 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -170,7 +170,11 @@ namespace pdfi
virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
// Start a page.
-virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
+virtual void startPage(int pageNum, GfxState *state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef *xref
+#endif
+) SAL_OVERRIDE;
// End a page.
virtual void endPage() SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/reftokenhelper.hxx |7 ---
sc/source/core/tool/chartlis.cxx |8
sc/source/core/tool/detfunc.cxx|3 +--
sc/source/core/tool/reftokenhelper.cxx | 32 +++-
sc/source/core/tool/token.cxx |3 +--
sc/source/ui/unoobj/chart2uno.cxx | 20 ++--
sc/source/ui/view/viewfun6.cxx |8
7 files changed, 35 insertions(+), 46 deletions(-)
New commits:
commit c24999695d4ba9caec91c7cb2cf8dd02341b0ff0
Author: Kohei Yoshida
Date: Tue Jul 16 10:46:11 2013 -0400
More of the same.
Change-Id: I65902231e714f9b18b2d1ef61434913cb79af847
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index 0451dad..d7cfa8e 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -45,9 +45,9 @@ public:
::std::vector& rRefTokens, const OUString& rRangeStr,
ScDocument* pDoc,
const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar,
bool bOnly3DRef = false);
-static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken,
bool bExternal = false);
+static bool getRangeFromToken(ScRange& rRange, const ScTokenRef& pToken,
const ScAddress& rPos, bool bExternal = false);
-static void getRangeListFromTokens(ScRangeList& rRangeList, const
::std::vector& pTokens);
+static void getRangeListFromTokens(ScRangeList& rRangeList, const
::std::vector& pTokens, const ScAddress& rPos);
/**
* Create a double reference token from a range object.
@@ -59,7 +59,8 @@ public:
static bool SC_DLLPUBLIC isRef(const ScTokenRef& pToken);
static bool SC_DLLPUBLIC isExternalRef(const ScTokenRef& pToken);
-static bool SC_DLLPUBLIC intersects(const ::std::vector&
rTokens, const ScTokenRef& pToken);
+static bool SC_DLLPUBLIC intersects(
+const ::std::vector& rTokens, const ScTokenRef& pToken,
const ScAddress& rPos);
static void SC_DLLPUBLIC join(::std::vector& rTokens, const
ScTokenRef& pToken);
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index df584d4..db5096a 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -245,7 +245,7 @@ void ScChartListener::Update()
ScRangeListRef ScChartListener::GetRangeList() const
{
ScRangeListRef aRLRef(new ScRangeList);
-ScRefTokenHelper::getRangeListFromTokens(*aRLRef, *mpTokens);
+ScRefTokenHelper::getRangeListFromTokens(*aRLRef, *mpTokens, ScAddress());
return aRLRef;
}
@@ -289,7 +289,7 @@ public:
else
{
ScRange aRange;
-ScRefTokenHelper::getRangeFromToken(aRange, pToken, bExternal);
+ScRefTokenHelper::getRangeFromToken(aRange, pToken, ScAddress(),
bExternal);
if (mbStart)
startListening(aRange);
else
@@ -365,7 +365,7 @@ void ScChartListener::UpdateChartIntersecting( const
ScRange& rRange )
ScTokenRef pToken;
ScRefTokenHelper::getTokenFromRange(pToken, rRange);
-if (ScRefTokenHelper::intersects(*mpTokens, pToken))
+if (ScRefTokenHelper::intersects(*mpTokens, pToken, ScAddress()))
{
// force update (chart has to be loaded), don't use
ScChartListener::Update
mpDoc->UpdateChart(GetName());
@@ -376,7 +376,7 @@ void ScChartListener::UpdateChartIntersecting( const
ScRange& rRange )
void ScChartListener::UpdateSeriesRanges()
{
ScRangeListRef pRangeList(new ScRangeList);
-ScRefTokenHelper::getRangeListFromTokens(*pRangeList, *mpTokens);
+ScRefTokenHelper::getRangeListFromTokens(*pRangeList, *mpTokens,
ScAddress());
mpDoc->SetChartRangeList(GetName(), pRangeList);
}
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 517a892..9240811 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -1426,8 +1426,7 @@ void ScDetectiveFunc::GetAllSuccs(SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCROW n
{
const ScAddress& aPos = aIter.GetPos();
ScTokenRef pRef(static_cast(p->Clone()));
-pRef->CalcAbsIfRel(aPos);
-if (ScRefTokenHelper::intersects(aSrcRange, pRef))
+if (ScRefTokenHelper::intersects(aSrcRange, pRef, aPos))
{
// This address is absolute.
pRef = ScRefTokenHelper::createRefToken(aPos);
diff --git a/sc/source/core/tool/reftokenhelper.cxx
b/sc/source/core/tool/reftokenhelper.cxx
index dbacb44..4580c4f 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -121,19 +121,8 @@ void ScRefTokenHelper::compileRangeRepresentation(
rRefTokens.clear();
}
-namespace {
-
-//may return a relative address
-void singleRefToAddr(const ScSingleRefData& rRef, ScAddress& rAddr)
-{
-rAddr.SetCol(rRef.nCol);
-rAddr.SetRow(rRef.nRow);
-rAddr.SetTab(rRef.nTab);
-}
-
-}
-
-b
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/ChangeLog | 16 +++-
librelogo/source/LibreLogo/LibreLogo.py | 42 +---
2 files changed, 49 insertions(+), 9 deletions(-)
New commits:
commit 8a8f7fb852c7ce2713b107d8d9a33450199ae86b
Author: László Németh
Date: Mon Jul 15 12:41:37 2013 +0200
librelogo: hexa arguments fdo#66917 and cropped SVG saving
Change-Id: I12ad6b63221bce0ed7d988f5c0f91dce81055ec0
Reviewed-on: https://gerrit.libreoffice.org/4916
Reviewed-by: Németh László
Tested-by: Németh László
diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 0a04813..e056c19 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,4 +1,18 @@
-2012-02-24 László Németh:
+2013-07-15 László Németh:
+* optional named PICTURE blocks: PICTURE "name" [ CIRCLE 5 ]
+* save PICTURE as cropped SVG file using path names, for example:
+ PICTURE "example.svg" [ CIRCLE 5 CIRCLE 20 ] ; save in the home directory
+ PICTURE "/home/user/example.svg" [ CIRCLE 10 ] ; absolute path (on Linux)
+ PICTURE "tmp/example.svg" [ CIRCLE 10 ] ; relative to the home directory
+* support hexadecimal arguments
+
+2013-06-26 László Németh
+* clockwise HEADING
+
+2013-04-30 László Németh
+* fix hide/show turtle
+
+2013-02-24 László Németh:
* fix Asian and CTL language support. Language recognition depends from the
UI language of LibreOffice and the language(s) of the document.
* fix turtle shape, the problem with the old arrow-like turtle shape
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index bf925c8..49983d3 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -694,10 +694,13 @@ def __cs__(select = True):
if select:
_.doc.CurrentController.select(_.drawpage)
-def __dispatcher__(s, properties = ()):
+def __dispatcher__(s, properties = (), doc = 0):
ctx = XSCRIPTCONTEXT.getComponentContext()
d =
ctx.ServiceManager.createInstanceWithContext("com.sun.star.frame.DispatchHelper",
ctx)
-d.executeDispatch(_.doc.CurrentController.Frame, s, "", 0, properties)
+if doc != 0:
+ d.executeDispatch(doc.CurrentController.Frame, s, "", 0, properties)
+else:
+ d.executeDispatch(_.doc.CurrentController.Frame, s, "", 0, properties)
def __getshape__(shapename):
try:
@@ -1192,15 +1195,17 @@ def position(n = -1):
pos.X, pos.Y = pos.X + turtle.BoundRect.Width / 2.0, pos.Y +
turtle.BoundRect.Height / 2.0
return [ pos.X * __MM10_TO_TWIP__ / __PT_TO_TWIP__, pos.Y *
__MM10_TO_TWIP__ / __PT_TO_TWIP__ ]
-def __groupstart__():
+def __groupstart__(name = ""):
global __group__, __grouplefthang__, __groupstack__
__removeshape__(__ACTUAL__)
__groupstack__.append(__group__)
+if name != "": # store pic name (for correct repcount)
+ __groupstack__.append(name)
__groupstack__.append(__grouplefthang__)
__group__ =
uno.getComponentContext().ServiceManager.createInstance('com.sun.star.drawing.ShapeCollection')
__grouplefthang__ = 0
-def __groupend__():
+def __groupend__(name = ""):
global __group__, __grouplefthang__, __groupstack__
g = 0
if __group__.getCount() > 1:
@@ -1220,6 +1225,26 @@ def __groupend__():
elif __group__.getCount() == 1:
g = __group__.getByIndex(0)
__grouplefthang__ = min(__groupstack__.pop(), __grouplefthang__)
+if name != "":
+ name = __groupstack__.pop()
+if name and ".SVG" == name[-4:].upper() and g:
+ _.doc.CurrentController.select(g)
+ __dispatcher__(".uno:Copy")
+ ctx = XSCRIPTCONTEXT.getComponentContext()
+ d =
ctx.ServiceManager.createInstanceWithContext("com.sun.star.frame.Desktop", ctx)
+ draw = d.loadComponentFromURL("private:factory/sdraw", "_blank", 0, ())
+ drawpage = draw.getDrawPages().getByIndex(0)
+ __dispatcher__(".uno:Paste", (), draw)
+ pic = drawpage.getByIndex(0)
+ pic.setPosition(__Point__((g.BoundRect.Width - g.Size.Width)//2,
(g.BoundRect.Height - g.Size.Height)//2))
+ drawpage.Height, drawpage.Width = g.BoundRect.Height, g.BoundRect.Width
+ __time__.sleep(1) # avoid writing problem
+ if not os.path.isabs(name):
+name = os.path.expanduser('~') + os.path.sep + name
+ __dispatcher__(".uno:ExportTo", (__getprop__("URL",
unohelper.systemPathToFileUrl(name)), __getprop__("FilterName",
"draw_svg_Export")), draw)
+ __time__.sleep(1)
+ draw.dispose()
+
__group__ = __groupstack__.pop()
if __group__ and g:
__group__.add(g)
@@ -1252,7 +1277,8 @@ def __loadlang__(lang, a):
{ "i": repcount + str(next(loopi)), "j": repcount, "orig": re.sub(
r"(?ui)(? (1 + sqrt(x))
+
[r"\b(__(?:int|float|string)__len|round|abs|sin|cos|sqrt|set|list|tuple|sorted)\b
((?:\w|\d+([,.]\d+)?|0[xX][0-9a-fA-F]+|[-
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/formulacell.cxx | 132 ++--
1 file changed, 66 insertions(+), 66 deletions(-)
New commits:
commit 03464912c911eedba5a540ccab603294373ea747
Author: Kohei Yoshida
Date: Tue Jul 16 10:21:47 2013 -0400
More on the quest to eliminate CalcAbsIfRel().
Change-Id: I5f20752896825d40a8fc3773d5ecb76bd7c53b46
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 41a53f1..6a77c715 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -48,7 +48,6 @@
#include "types.hxx"
#include "scopetools.hxx"
-#include
#include
using namespace formula;
@@ -70,24 +69,24 @@ const sal_uInt16 MAXRECURSION = 400;
using std::deque;
-typedef SCCOLROW(*DimensionSelector)(const ScSingleRefData&);
+typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&);
-static SCCOLROW lcl_GetCol(const ScSingleRefData& rData)
+static SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData)
{
-return rData.nCol;
+return rData.toAbs(rPos).Col();
}
-static SCCOLROW lcl_GetRow(const ScSingleRefData& rData)
+static SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData)
{
-return rData.nRow;
+return rData.toAbs(rPos).Row();
}
-static SCCOLROW lcl_GetTab(const ScSingleRefData& rData)
+static SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData)
{
-return rData.nTab;
+return rData.toAbs(rPos).Tab();
}
@@ -95,25 +94,22 @@ static SCCOLROW lcl_GetTab(const ScSingleRefData& rData)
*/
static bool
lcl_checkRangeDimension(
-const SingleDoubleRefProvider& rRef1,
-const SingleDoubleRefProvider& rRef2,
-const DimensionSelector aWhich)
+const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const
SingleDoubleRefProvider& rRef2,
+const DimensionSelector aWhich)
{
-return
-aWhich(rRef1.Ref1) == aWhich(rRef2.Ref1)
-&& aWhich(rRef1.Ref2) == aWhich(rRef2.Ref2);
+return aWhich(rPos, rRef1.Ref1) == aWhich(rPos, rRef2.Ref1) &&
+aWhich(rPos, rRef1.Ref2) == aWhich(rPos, rRef2.Ref2);
}
static bool
lcl_checkRangeDimensions(
-const SingleDoubleRefProvider& rRef1,
-const SingleDoubleRefProvider& rRef2,
-bool& bCol, bool& bRow, bool& bTab)
+const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const
SingleDoubleRefProvider& rRef2,
+bool& bCol, bool& bRow, bool& bTab)
{
-const bool bSameCols(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetCol));
-const bool bSameRows(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetRow));
-const bool bSameTabs(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetTab));
+const bool bSameCols(lcl_checkRangeDimension(rPos, rRef1, rRef2,
lcl_GetCol));
+const bool bSameRows(lcl_checkRangeDimension(rPos, rRef1, rRef2,
lcl_GetRow));
+const bool bSameTabs(lcl_checkRangeDimension(rPos, rRef1, rRef2,
lcl_GetTab));
// Test if exactly two dimensions are equal
if (!(bSameCols ^ bSameRows ^ bSameTabs)
@@ -133,9 +129,10 @@ lcl_checkRangeDimensions(
*/
static bool
lcl_checkRangeDimensions(
-const deque::const_iterator aBegin,
-const deque::const_iterator aEnd,
-bool& bCol, bool& bRow, bool& bTab)
+const ScAddress& rPos,
+const deque::const_iterator aBegin,
+const deque::const_iterator aEnd,
+bool& bCol, bool& bRow, bool& bTab)
{
deque::const_iterator aCur(aBegin);
++aCur;
@@ -143,7 +140,7 @@ lcl_checkRangeDimensions(
bool bOk(false);
{
const SingleDoubleRefProvider aRefCur(**aCur);
-bOk = lcl_checkRangeDimensions(aRef, aRefCur, bCol, bRow, bTab);
+bOk = lcl_checkRangeDimensions(rPos, aRef, aRefCur, bCol, bRow, bTab);
}
while (bOk && aCur != aEnd)
{
@@ -151,7 +148,7 @@ lcl_checkRangeDimensions(
bool bColTmp(false);
bool bRowTmp(false);
bool bTabTmp(false);
-bOk = lcl_checkRangeDimensions(aRef, aRefCur, bColTmp, bRowTmp,
bTabTmp);
+bOk = lcl_checkRangeDimensions(rPos, aRef, aRefCur, bColTmp, bRowTmp,
bTabTmp);
bOk = bOk && (bCol == bColTmp && bRow == bRowTmp && bTab == bTabTmp);
++aCur;
}
@@ -163,81 +160,84 @@ lcl_checkRangeDimensions(
return false;
}
-
-bool
-lcl_lessReferenceBy(
-const ScToken* const pRef1, const ScToken* const pRef2,
-const DimensionSelector aWhich)
+class LessByReference : std::binary_function
{
-const SingleDoubleRefProvider rRef1(*pRef1);
-const SingleDoubleRefProvider rRef2(*pRef2);
-return aWhich(rRef1.Ref1) < aWhich(rRef2.Ref1);
-}
+ScAddress maPos;
+DimensionSelector maFunc;
+public:
+LessByReference(const ScAddress& rPos, const DimensionSelector& rFunc) :
+maPos(rPos), maFunc(rFunc) {}
+bool operator() (const ScToken* pRef1, const ScToken* pRef2)
+{
+const SingleDoubleRefProvid
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.3'
Tag 'libreoffice-4.1.0.3' created by Christian Lohmaier at 2013-07-16 15:19 -0700 Tag libreoffice-4.1.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR5VZ1AAoJEPQ0oe+v7q6jcCEP+wUQhxeS927SdMLUPPCbvVO3 ClGaAWUSQAoyHFSne7pCwUfjwjc5VPS2vkiLN7/DJht2IxqoAnqq5HKgf/9baWe1 D+4KbOSwdPPUIGt4VjmpRlQsnuhGIGQr/jKiSSPgTzqOtQDMcfZTAdtrjlfeKnnC tt0K3+Dat/NEhhGJargraT2HYwXAvDVeYdqUIVknl5nx4u35sri8eW4uXG+C7V6m iApjFPJtUnZLTTOaGeJlSid6EOQDSrr8R5AhVGVg/UkmHQ6V0eypKNoq1sykz8PM XPFrYSxkcsMWyru7K5GF+eMaXpDB5YwoCDPgiQ+05k51ca8H3n7DwuaSEDQu4/7g nJZRpCAV5Uyk8g/N+M2968YznIkg6dWeMPxvMFR/FBoOsZXj4qsUVsWnI4blGsEr A2cxhyW4m1WIf2mDGlqwGeJs/QmoNoftDZOCg/J0hFoIde5sTWrMqxPxLvdBNXuL 9txYrvPgKCUB+2Hb6esXvxgUhkOrnUetKRdyz+Jqz/AIIKjtuuWg3eH8+/gaQMSq O8knNrITFMmE+ZT7kgph4MRaa3tKUQNsgbcn0X/JkfrjvYsigL2pcmvEicvO/V0i RTUoCmIrr6IriwOPofjNal7uULeQTTfODm/v2qLZ27sKt1YaO/mmDRr6vDDAFB0t smY4NB4FvyWME1XpQ3rr =ES3T -END PGP SIGNATURE- Changes since libreoffice-4.1.0.1-230: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.3'
Tag 'libreoffice-4.1.0.3' created by Christian Lohmaier at 2013-07-16 15:19 -0700 Tag libreoffice-4.1.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR5VZxAAoJEPQ0oe+v7q6jGesP/i2u9g26jD8e5JzpwUdAk6qL S/36ADzH+BnGPwTRGjiXXAA0SpCk+8eWFmMDxbVLotvJwZ0gQJnmAlJehQppzk7S oxdF9lraI/gryQnKjFzrtBs1WcusXREKc7vps3B46ISYUOc09UKC5EU8vVZO+FI5 tcwoIW8aci2doU81XAQ+Tb+Ktl3d7tfQe3x/7NqU0da+hg4CifU4tcVjM/jI+UI9 SX2PToHfY8d2NeJTRUYaBezGsP5fXKiBhpfQ35eI5lKx4cdce2ifjHBEwB/a61Ar AmmGjF3U//4RHfPROzfAbekPXB9fpj4GW3c2P2/1lJTssVbe4xlJZazEPExQccuR xQeeKZ7fb5DLEtsBDgYd6i4CmltEPvuoFh17Ad9dWYMO8ZOLIadOVHh+bwrpMJdx V32MXkYqiB6CgEzvgt0lpfjxCTi9NemtlPeriTQIDH6ff3PRu3fk7JGBbSwTKo2A wCUa9AmJMeFXewxbE+W3Dmp7yybWdiFF954isFxLnlDxGj7iFSOlPD5butLN7YmN vKY50l75PnqSEl+s5GQ6/3EER7p5mM8tdmN4UvTRJ3Rge2rxTjWBV0THPizIufVP 1CWjGJRf5MDcNI+u71hEnMj92hJMjkd6KCGgXn9XIX+Zf5ZZ+C354FQeYV1JI3FS PWcn1ccYnZpGWQ+C6QPh =G+GA -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-15: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.3'
Tag 'libreoffice-4.1.0.3' created by Christian Lohmaier at 2013-07-16 15:19 -0700 Tag libreoffice-4.1.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR5VZzAAoJEPQ0oe+v7q6jJTUQALV+FSaD/tzHZ0TqUa3PpZjM +sfb+5am94R/PAhhvbHLt4AYb03gqfsLu63d2reiniAtE5wh/qM9mjjReiuaW9uW uRxNzbuQn+Eg5/UcZ+L6CnEu8vmLBWVEICy4+onTYivkq6kqc5Zsy5e6bjTVoDl/ xDK7IVd/Z2XJ5hIxhhNJ61cYK8m8gvgutOM9S4UmcD5EzY90CaJW8w42LdcRDqX4 lvxJVmQu7RWuFcuJjUL4U2O1MfbaY6Xv8jF/kyo0teCyuI44jQfGnCfY6Q1SBEhE TgDLSowjc5XjhW4aKeviFpxkUcJLNUF6a5ObmPPgINapdJ2RiNvm2cl+gPKMF9tb hLMVGNc34GyVjEfWFxGb5v00zYcWWzgjlFxZsWqDSYr+FqubY9QXf0XbbPmoyW5Q vHWoF82tuneZ2OKWJ1Ma4uWYlfBLpfE73ngSCKYq0Umv5WvxvV8i++cFPCjqpTeK QOD4NtcFJOGH0Ckq5dKsY7Rm2w8BBpwsxSxDshW3bXn0caOn8jQO+BKbulSuVjz1 ijrLQiMOmgkg7H/F+O9hlEW6jyXKOW6Ss2V1uLVw7pC3bz6+wDq8Ua4pnMHYmW3i NK0JMhqsMWJBUkGKCHGbXXxVHeXn/8J06lGuUzgvzXLg3IGq06mQC117Empt3D+y 3I0gnZhH6CZ4jrrlgSYT =wLot -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-28: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.3'
Tag 'libreoffice-4.1.0.3' created by Christian Lohmaier at 2013-07-16 15:19 -0700 Tag libreoffice-4.1.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJR5VZvAAoJEPQ0oe+v7q6jps4QAJ3wrFXGmrj7kfszTjrZQhrx Pr9U0u9zafOdKOAzn7hH/n21plXl+utnxzQEQ1kpArD/c8kdpTE9kV8orAqnHFKL pMKtcEfC5SoO3dqnqPd7CfIR8iua/spcoV6VlhHV0aOVd2YZNtEUQFcRIwHmkDYb Y6aTYPa35N1wI/YO9nTkP32JBCgolTXWvV2e8MUi2b3SeOGxY+S4H9onqbnvKVrM kbfjBwL9390IkXkFPPFCMRaxa7xcTKmoZNH8Y/4NV9IdD2ajS3Re6HozPag3NLA8 LvV29CP79qYBUFNktPvTCIXBsqWHQo6UqGUJNHnu1OcIGp1oHnEh+6O9ZihfxPxy lLFnj04FhCMXiRLa66JNnD1mM9Gk4BT0tvvvM3d+NccXFtECym28CSgh5X20XQp8 L1upwHc0Zb99v/gnULUUe99cClll7y1+sgd1E0q+8C6kbrEoYvgwhSVROQ0vmtLq t+Z+9KC9KLXW2vediF+ARTA2AWOpXTjV9SnKhovfYFWdUt744XluARZc8xoNBnSx uHvXK3vdigzxzHy13s1LA5/Wy1qcbHz6Nl+Qz4dtsBMjDsvtffokDEc/aSosDQTc tw/5dVkj+kCQFYduus4M8gbJltTI2m429o/ZLr0NFZlF+WiZJNdITh2DWOGVk7tA 6QSNOHxSvYbYcyobyc+T =C/by -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - drawinglayer/source dtrans/source vcl/unx
drawinglayer/source/processor2d/vclprocessor2d.cxx |3 ++-
dtrans/source/win32/dtobj/FetcList.cxx |7 ---
vcl/unx/gtk/window/gtkframe.cxx|2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit a609daa146c5588c6a35c2c145e9573c625ec123
Author: Herbert Dürr
Date: Tue Jul 16 13:30:18 2013 +
#i122752# check iterator in each iteration of
CFormatEtcContainer::nextFormatEtc()'s loop
Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator
beyond
the container bounds. The comparable loop in
CFormatEtcContainer::skipFormatEtc()
already checks the iterator against the container end in each iteration.
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx
b/dtrans/source/win32/dtobj/FetcList.cxx
index 531ae38..ca455dc 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -143,10 +143,11 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc(
LPFORMATETC lpFetc,
sal_uInt32 nFetched = 0;
-if ( m_EnumIterator != m_FormatMap.end( ) )
+for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
{
-for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
-CopyFormatEtc( lpFetc, *m_EnumIterator );
+if ( m_EnumIterator == m_FormatMap.end() )
+break;
+CopyFormatEtc( lpFetc, *m_EnumIterator );
}
return nFetched;
commit f56ded7c2aac573e4e5f060892327843eed23d0c
Author: Andre Fischer
Date: Tue Jul 16 13:03:12 2013 +
122709: Also test for small heights.
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 870d63e..52c1eaa 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1245,7 +1245,7 @@ Size GtkSalFrame::calcDefaultSize()
long h = aScreenSize.Height();
-if (aScreenSize.Width() <= 1024)
+if (aScreenSize.Width() <= 1024 || aScreenSize.Height() <= 768)
{
// For small screen use the old default values. Original comment:
// fill in holy default values brought to us by product management
commit db4a17f202e69447fd22c246843a6cda3e52
Author: Armin Le Grand
Date: Tue Jul 16 12:51:14 2013 +
i122758 Initialize Mask with non-transparent
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 7b9d474..2fc409d 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -425,7 +425,8 @@ namespace drawinglayer
#if defined(MACOSX)
const AlphaMask aMaskBmp( aContent.GetSizePixel());
#else
-const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to
non-transparent
#endif
aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_r...
Michael Stahl has uploaded a new patch set (#3). Change subject: gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule .. gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 --- M crashrep/CustomTarget_crashrep_res.mk M instsetoo_native/CustomTarget_install.mk M setup_native/CustomTarget_mac.mk M shell/CustomTarget_shlxthdl_res.mk M solenv/gbuild/CustomTarget.mk M solenv/gbuild/Gallery.mk M solenv/gbuild/InstallModuleTarget.mk M sysui/CustomTarget_infoplist.mk M sysui/CustomTarget_share.mk M sysui/Module_sysui.mk 10 files changed, 72 insertions(+), 92 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4937/3 -- To view, visit https://gerrit.libreoffice.org/4937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/inc
sfx2/inc/pch/precompiled_sfx.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 0706ab4a743f9070c137cd93070bcf112c21f92f Author: LuboÅ¡ LuÅák Date: Tue Jul 16 15:57:08 2013 +0200 remove usage of removed header Change-Id: I9c53f3b269b336ecd714c5b1d67ff333b541e9e6 diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 0b82b45..53a4811 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -730,7 +730,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sc/inc sc/source
sc/inc/dpfilteredcache.hxx |5
sc/source/core/data/dpfilteredcache.cxx | 12 +
sc/source/core/data/dpgroup.cxx | 300 +++-
3 files changed, 201 insertions(+), 116 deletions(-)
New commits:
commit 6af62db1f697abffa8c38c2d5d41bccab39b5b0a
Author: Kohei Yoshida
Date: Sat Jul 13 16:59:16 2013 -0400
fdo#63998: Filtering by page fields to work again.
Change-Id: I267ccb30cfa6347313fa1de96e18731f0e22d57d
(cherry picked from commit 76488b00ed75bf7915d6d57af9875c6434e740d6)
Reviewed-on: https://gerrit.libreoffice.org/4894
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit eb426753811befc69b3929146ac68cb97f92f7b0)
Reviewed-on: https://gerrit.libreoffice.org/4925
Reviewed-by: David Tardon
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index c65b95c..b601db0 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -56,6 +56,8 @@ public:
/** returns true if the matching condition is met for a single cell
value, or false otherwise. */
virtual bool match( const ScDPItemData& rCellData ) const = 0;
+
+virtual std::vector getMatchValues() const = 0;
};
/** ordinary single-item filter. */
@@ -66,7 +68,7 @@ public:
virtual ~SingleFilter() {}
virtual bool match(const ScDPItemData& rCellData) const;
-
+virtual std::vector getMatchValues() const;
const ScDPItemData& getMatchValue() const;
private:
@@ -82,6 +84,7 @@ public:
GroupFilter();
virtual ~GroupFilter() {}
virtual bool match(const ScDPItemData& rCellData) const;
+virtual std::vector getMatchValues() const;
void addMatchItem(const ScDPItemData& rItem);
size_t getMatchItemCount() const;
diff --git a/sc/source/core/data/dpfilteredcache.cxx
b/sc/source/core/data/dpfilteredcache.cxx
index 51bf571..62c33eb 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -62,6 +62,13 @@ bool ScDPFilteredCache::SingleFilter::match(const
ScDPItemData& rCellData) const
return maItem == rCellData;
}
+std::vector ScDPFilteredCache::SingleFilter::getMatchValues()
const
+{
+std::vector aValues;
+aValues.push_back(maItem);
+return aValues;
+}
+
const ScDPItemData& ScDPFilteredCache::SingleFilter::getMatchValue() const
{
return maItem;
@@ -83,6 +90,11 @@ bool ScDPFilteredCache::GroupFilter::match(const
ScDPItemData& rCellData) const
return false;
}
+std::vector ScDPFilteredCache::GroupFilter::getMatchValues()
const
+{
+return maItems;
+}
+
void ScDPFilteredCache::GroupFilter::addMatchItem(const ScDPItemData& rItem)
{
maItems.push_back(rItem);
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 5368523..1e8059a 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -54,41 +54,58 @@ const sal_uInt16 SC_DP_LEAPYEAR = 1648; // arbitrary
leap year for date calc
class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase
{
public:
-ScDPGroupNumFilter(const ScDPItemData& rValue, const ScDPNumGroupInfo&
rInfo);
+ScDPGroupNumFilter(const std::vector& rValues, const
ScDPNumGroupInfo& rInfo);
virtual ~ScDPGroupNumFilter() {}
virtual bool match(const ScDPItemData &rCellData) const;
+virtual std::vector getMatchValues() const;
private:
-ScDPItemData maValue;
+std::vector maValues;
ScDPNumGroupInfo maNumInfo;
};
-ScDPGroupNumFilter::ScDPGroupNumFilter(const ScDPItemData& rValue, const
ScDPNumGroupInfo& rInfo) :
-maValue(rValue), maNumInfo(rInfo) {}
+ScDPGroupNumFilter::ScDPGroupNumFilter(const std::vector&
rValues, const ScDPNumGroupInfo& rInfo) :
+maValues(rValues), maNumInfo(rInfo) {}
bool ScDPGroupNumFilter::match(const ScDPItemData& rCellData) const
{
if (rCellData.GetType() != ScDPItemData::Value)
return false;
-double fVal = maValue.GetValue();
-if (rtl::math::isInf(fVal))
+std::vector::const_iterator it = maValues.begin(), itEnd =
maValues.end();
+for (; it != itEnd; ++it)
{
-if (rtl::math::isSignBitSet(fVal))
+double fVal = it->GetValue();
+if (rtl::math::isInf(fVal))
{
-// Less than the min value.
-return rCellData.GetValue() < maNumInfo.mfStart;
+if (rtl::math::isSignBitSet(fVal))
+{
+// Less than the min value.
+if (rCellData.GetValue() < maNumInfo.mfStart)
+return true;
+}
+
+// Greater than the max value.
+if (maNumInfo.mfEnd < rCellData.GetValue())
+return true;
+
+continue;
}
-// Greater than the max value.
-return maNumInfo.mfEnd < rCellDa
[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang sfx2/source starmath/source
compilerplugins/clang/pointertobool.cxx |7 ---
sfx2/source/dialog/versdlg.cxx |1 +
starmath/source/mathtype.cxx|2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 6ef38bf1c04de2a0733e5bfd88c483416541d098
Author: LuboÅ¡ LuÅák
Date: Tue Jul 16 15:39:23 2013 +0200
avoid unused warning in non-debug build
Change-Id: I209292603b69f51d354369d99cb58fe32bc65a8d
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index a021580..24fdc2b 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -498,6 +498,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(Window
*pParent, SfxVersion
IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton)
{
assert(pButton == m_pOKButton);
+(void)pButton;
m_rInfo.aComment = m_pEdit->GetText();
EndDialog(RET_OK);
return 0L;
commit 784a34bf20ecf2566fd4db9f81b3a6bf9d2b7033
Author: LuboÅ¡ LuÅák
Date: Tue Jul 16 15:31:40 2013 +0200
fix problem caused by confusing immutability OUString semantics again
Change-Id: I9207ec3309b9970afd5c56718829836eead4592b
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 9875684..94310db 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2909,7 +2909,7 @@ int MathType::HandleChar(sal_Int32 &rTextStart,int
&rSetSize,int nLevel,
OUString aStr;
TypeFaceToString(aStr,nOldTypeFace);
aStr += "\"";
-rRet.replaceAt(rTextStart,0,aStr);
+rRet = rRet.replaceAt(rTextStart,0,aStr);
aStr = OUString();
TypeFaceToString(aStr,nTypeFace);
commit c17c8cc029dc6c104e16627646389d09eb1e6119
Author: LuboÅ¡ LuÅák
Date: Tue Jul 16 15:30:04 2013 +0200
mention the explicit bool conversion from C++11 for pointer-to-bool check
Change-Id: I050019b30d2ec96bbd25916624f8cb88d72110e4
diff --git a/compilerplugins/clang/pointertobool.cxx
b/compilerplugins/clang/pointertobool.cxx
index 6988c4f..238e018 100644
--- a/compilerplugins/clang/pointertobool.cxx
+++ b/compilerplugins/clang/pointertobool.cxx
@@ -26,9 +26,10 @@ and potentially mistakes.
So far the only places that are checked are passing arguments to functions, as
those
could easily choose a different overload.
-The original idea was that the only conversions that are considered safe are
-in conditions (which in turn means also in ||, && and ! operators) and places
-where it's considered unlikely for it to be a problem (or rather, less of a
problem
+The original idea was that to follow the explicit bool feature from C++11,
where
+the only conversions that would be considered safe are in conditions (which
+in turn means also in ||, && and ! operators) and places where it's considered
+unlikely for it to be a problem (or rather, less of a problem
than explicitly avoiding the warning in the code). The code for this is
currently
commented out (there are a couple of places such as 'bool foo =
returns_pointer();'
that would need modification), possibly enable those later.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_r...
Michael Stahl has uploaded a new patch set (#2). Change subject: gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule .. gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 --- M crashrep/CustomTarget_crashrep_res.mk M instsetoo_native/CustomTarget_install.mk M setup_native/CustomTarget_mac.mk M shell/CustomTarget_shlxthdl_res.mk M solenv/gbuild/CustomTarget.mk M solenv/gbuild/Gallery.mk M solenv/gbuild/InstallModuleTarget.mk M sysui/CustomTarget_infoplist.mk M sysui/CustomTarget_share.mk M sysui/Module_sysui.mk 10 files changed, 72 insertions(+), 92 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4937/2 -- To view, visit https://gerrit.libreoffice.org/4937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source
cui/source/options/fontsubs.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 0c7bb0be0f65e4c667dfab1f15667f74c1c713f6
Author: Caolán McNamara
Date: Tue Jul 16 09:38:48 2013 +0100
option dialog isn't fully layout aware yet, so always calculate
otherwise the font subst opt page has overlapping entries
(cherry picked from commit 84e5cdce3ed58c663109bb557b75cd6e45bb2dbc)
Change-Id: Ifed85cf8c1c2da70eae2d18b9ef32b61ce278c4a
Reviewed-on: https://gerrit.libreoffice.org/4936
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index ad6cac1..91ecf40 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -410,8 +410,7 @@ void SvxFontSubstCheckListBox::setColSizes()
void SvxFontSubstCheckListBox::Resize()
{
SvxSimpleTable::Resize();
-if (isInitialLayout(this))
-setColSizes();
+setColSizes();
}
void SvxFontSubstCheckListBox::SetTabs()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools sfx2/source sot/source svl/source sw/inc sw/source tools/Library_tl.mk tools/source
include/tools/cachestr.hxx | 64 --
include/tools/stream.hxx |7 +-
sfx2/source/bastyp/mieclip.cxx |5 -
sot/source/sdstor/storage.cxx |3
svl/source/items/lckbitem.cxx |5 -
sw/inc/pch/precompiled_sw.hxx |1
sw/source/core/edit/edglss.cxx |3
sw/source/core/unocore/unoobj.cxx |3
sw/source/core/unocore/unoobj2.cxx |1
sw/source/ui/wrtsh/wrtsh1.cxx |1
tools/Library_tl.mk|1
tools/source/inet/inetstrm.cxx |5 -
tools/source/stream/cachestr.cxx | 125 -
tools/source/stream/stream.cxx | 15
14 files changed, 28 insertions(+), 211 deletions(-)
New commits:
commit c66e9cd24c28ff00f15770037ae9a8dd852fdada
Author: Palenik Mihály
Date: Thu Jul 11 18:30:38 2013 +0200
Delete SvCacheStream class
I changed SvCacheStream class to SvMemoryStream class in
the following: MSE40HTMLClipFormatObj, SfxLockBytesItem,
SwEditShell, INetMIMEMessageStream classes,
MakeLockBytes_Impl function and SwUnoCursorHelper namespace.
I modified header the precompiled_sw.hxx, wrtsh1.cxx, unoobj2.cxx.
I added two functions in SvMemoryStream class: GetBuffer and
GetSize, and I renamed the old GetSize function to GetBufSize.
I deleted SvCacheStream class.
Change-Id: I929236538dfbe23cccfd1eb85f10c1d5411baa8d
Reviewed-on: https://gerrit.libreoffice.org/4847
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/tools/cachestr.hxx b/include/tools/cachestr.hxx
deleted file mode 100644
index 6d98056..000
--- a/include/tools/cachestr.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _CACHESTR_HXX
-#define _CACHESTR_HXX
-
-#include
-#include "tools/toolsdllapi.h"
-
-class TempFile;
-
-class TOOLS_DLLPUBLIC SvCacheStream : public SvStream
-{
-private:
-OUStringaFileName;
-sal_uIntPtr nMaxSize;
-boolbPersistent;
-
-SvStream* pSwapStream;
-SvStream* pCurrentStream;
-TempFile* pTempFile;
-
-TOOLS_DLLPRIVATE virtual sal_uIntPtr GetData( void* pData,
- sal_uIntPtr nSize );
-TOOLS_DLLPRIVATE virtual sal_uIntPtr PutData( const void* pData,
- sal_uIntPtr nSize );
-TOOLS_DLLPRIVATE virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
-TOOLS_DLLPRIVATE virtual void FlushData();
-TOOLS_DLLPRIVATE virtual void SetSize( sal_uIntPtr nSize );
-
-public:
-SvCacheStream( sal_uIntPtr nMaxMemSize = 0 );
-~SvCacheStream();
-
-voidSetFilename( const OUString& rFN ) { aFileName = rFN; } //
call only from FilenameHdl
-const OUString& GetFilename() const { return aFileName; }
-
-voidSwapOut();
-const void* GetBuffer();
-sal_uIntPtr GetSize();
-
-boolIsPersistent() { return bPersistent; }
-voidSetPersistence( bool b = true ) { bPersistent = b; }
-voidSetSwapStream( SvStream *p ) { pSwapStream = p; } // call
only from FilenameHdl
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 8aed53c..d71f158 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -702,8 +702,7 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
SvMemoryStream (const SvMemoryStream&);
SvMemoryStream & operator= (const SvMemoryStream&);
-friend class SvCacheStream;
-sal_SizeGetSize() const { return nSize; }
+sal_SizeGetBufSize() const { return nSize; }
protected:
sal_SizenSize;
@@ -744,6 +743,8 @@ public:
virtual voidResetError();
+const void*GetBuffer();
+sal_uIntPtr GetSize();
sal_SizeGetEndOfData() const { return nEndOfData; }
const void* GetData() { Flush(); return pBuf; }
operator const void*() { Flus
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 12 - source/text/shared/01/05210700.xhp | 45 ++--- 2 files changed, 23 insertions(+), 34 deletions(-) New commits: commit a1aa7b04de5f17eb754341962987bdb8ab3343fe Author: Caolán McNamara Date: Tue Jul 16 14:25:54 2013 +0100 update help ids for transparency tabpage .ui conversion Change-Id: Ie154684f8f6cfd2c117123288ebc0eab09edfee2 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4a24091..0ed86c9 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -741,7 +741,6 @@ HID_AP_INSERT_DB_SEL,54849, HID_AREA_AREA,33798, HID_AREA_BITMAP,33800, HID_AREA_SHADOW,33805, -HID_AREA_TRANSPARENCE,33806, HID_AUTH_FIELD_ADDRESS,54882, HID_AUTH_FIELD_ANNOTE,54883, HID_AUTH_FIELD_AUTHOR,54884, @@ -7271,7 +7270,6 @@ svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORITO,705433111, svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERT,705433114, svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERTTO,705433118, svx_ListBox_RID_SVXPAGE_TEXTANIMATION_LB_EFFECT,703729153, -svx_ListBox_RID_SVXPAGE_TRANSPARENCE_LB_TRGR_GRADIENT_TYPES,701599235, svx_ListBox_RID_SVXTBX_UNDO_REDO_CTRL_LB_SVXTBX_UNDO_REDO_CTRL,1788300811, svx_ListBox_RID_SVX_DLG_SHOWGRIDCOLUMNS_1,1368837633, svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTHEIGHT,701009435, @@ -7385,13 +7383,6 @@ svx_MetricField_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM,703224324, svx_MetricField_RID_SVXPAGE_TEXTATTR_MTR_FLD_LEFT,703224321, svx_MetricField_RID_SVXPAGE_TEXTATTR_MTR_FLD_RIGHT,703224322, svx_MetricField_RID_SVXPAGE_TEXTATTR_MTR_FLD_TOP,703224323, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRANSPARENT,701602314, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_ANGLE,701602310, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_BORDER,701602311, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_CENTER_X,701602308, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_CENTER_Y,701602309, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_END_VALUE,701602313, -svx_MetricField_RID_SVXPAGE_TRANSPARENCE_MTR_TRGR_START_VALUE,701602312, svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT,1243027972, svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH,1243027970, svx_MetricField_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA,1243060738, @@ -7647,9 +7638,6 @@ svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOCHAR,705430027, svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOFRAME,705430029, svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPAGE,705430025, svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPARA,705430026, -svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_GRADIENT,701596170, -svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_LINEAR,701596169, -svx_RadioButton_RID_SVXPAGE_TRANSPARENCE_RBT_TRANS_OFF,701596168, svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_DIRECT,1237795331, svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_MANUAL,1237795332, svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_SYSTEM,1237795330, diff --git a/source/text/shared/01/05210700.xhp b/source/text/shared/01/05210700.xhp index 6e1bac9..5f920bd 100644 --- a/source/text/shared/01/05210700.xhp +++ b/source/text/shared/01/05210700.xhp @@ -35,6 +35,7 @@ transparency;areas areas; transparency + Transparency Set the transparency options for the fill that you apply to the selected object. @@ -43,39 +44,39 @@ Transparency mode Specify the type of transparency that you want to apply. - + No transparency -Turns off color transparency. This is the default setting. - +Turns off color transparency. This is the default setting. + Transparency -Turns on color transparency. Select this option, and then enter a number in the box, where 0% is fully opaque and 100% is fully transparent. - +Turns on color transparency. Select this option, and then enter a number in the box, where 0% is fully opaque and 100% is fully transparent. + Transparency spin button -Adjusts the transparency of the current fill color. Enter a number between 0% (opaque) and 100% (transparent). - +Adjusts the transparency of the current fill color. Enter a number between 0% (opaque) and 100% (transparent). + Gradient -Applies a transparency gradient to the current fill color. Select this option, and then set the gradient properties. - +Applies a transparency gradient to the current fill color. Select this option, and then set the gradient properties. + Type -Select the type of transparency gradient that you want to apply. - +Select the type of transparency gradient that you want to apply. + Center X -Enter the horizontal offset for the gradient. - +Enter the horizontal offset for the gradient. + Center Y -Enter the vertical offset for the gradient. - +Enter the vertical offset for the gradient. + Angle -Enter a rotation angle for the gradient. - +Enter a rotation angle for the gradient. + Border -Enter the amount by which you want to adjust the trans
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 360d9162c7d9e07652278a05301276b39e035fed
Author: LuboÅ¡ LuÅák
Date: Fri Jul 12 15:29:51 2013 +0200
remove pointless empty variable
Change-Id: I118dccbe8461ba4c90a8c8d54e6f3fc46cb08b1f
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9920c07..f50eae5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3924,8 +3924,6 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const
SwFmtPageDesc &rPgDesc,
SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
mySegIter &rStart, bool bIgnoreCols)
{
-SwFmtPageDesc aEmpty;
-
if (IsNewDoc() && rIter == rStart)
{
rIter->mpPage =
@@ -3940,7 +3938,7 @@ SwFmtPageDesc
wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
}
OSL_ENSURE(rIter->mpPage, "no page!");
if (!rIter->mpPage)
-return aEmpty;
+return SwFmtPageDesc();
// Set page before hd/ft
const wwSection *pPrevious = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 159e3639077d8e05707133969c4e5cd710c10e2e Author: Caolán McNamara Date: Tue Jul 16 14:25:54 2013 +0100 Updated core Project: help a1aa7b04de5f17eb754341962987bdb8ab3343fe diff --git a/helpcontent2 b/helpcontent2 index c57..a1aa7b0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c5705ccf11d34e751687b9513b0988659063 +Subproject commit a1aa7b04de5f17eb754341962987bdb8ab3343fe ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/backgroundpage.ui | 60 +++--- 1 file changed, 44 insertions(+), 16 deletions(-) New commits: commit 3e787929d86ba9c306d54363a06de121fbe5c7aa Author: Caolán McNamara Date: Tue Jul 16 14:20:29 2013 +0100 tweak background fill color preview to be half-full height Change-Id: I44a9fc676129dda206e525ee89809f84d77aff48 diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 68a550a..0bf2060 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -151,22 +151,6 @@ True 6 - -150 -150 -True -True -True -True - - -0 -0 -1 -1 - - - True False @@ -208,6 +192,50 @@ 1 + + +True +False +True +True +vertical +True + + +True +True +True +True + + +False +True +0 + + + + +True +False +vertical + + + + + +False +True +1 + + + + +0 +0 +1 +1 + + 1 ___ 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/svdxcgv.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit c239615ca48a2ca15460a12ac654774ef927bfdc
Author: Armin Le Grand
Date: Tue Jul 16 10:55:54 2013 +
Resolves: #i122753# Force SwapIn for BitmapObjects which...
are part of a conversion to BitmapEx
(cherry picked from commit 4dc54d2ec37bc1595eb85548f5e3c6d2add2b10a)
Change-Id: I43a92bfbdb41c8c2215aacd65b65774dcf5ab2be
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f750448..5359d57 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -490,8 +490,17 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
for(sal_uInt32 a(0); a < nCount; a++)
{
+SdrObject* pCandidate = aSdrObjects[a];
+SdrGrafObj* pSdrGrafObj = dynamic_cast< SdrGrafObj*
>(pCandidate);
+
+if(pSdrGrafObj)
+{
+// #122753# To ensure existance of graphic content,
force swap in
+pSdrGrafObj->ForceSwapIn();
+}
+
xPrimitives[a] = new
drawinglayer::primitive2d::GroupPrimitive2D(
-
aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence());
+
pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence());
}
// get logic range
___
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' - 4d/c54d2ec37bc1595eb85548f5e3c6d2add2b10a
4d/c54d2ec37bc1595eb85548f5e3c6d2add2b10a |1 + 1 file changed, 1 insertion(+) New commits: commit 1d4aa0b985dc4fb282cf7864b7a8c3c3a5d72841 Author: Caolán McNamara Date: Tue Jul 16 14:17:40 2013 +0100 Notes added by 'git notes add' diff --git a/4d/c54d2ec37bc1595eb85548f5e3c6d2add2b10a b/4d/c54d2ec37bc1595eb85548f5e3c6d2add2b10a new file mode 100644 index 000..dccc914 --- /dev/null +++ b/4d/c54d2ec37bc1595eb85548f5e3c6d2add2b10a @@ -0,0 +1 @@ +merged as: c239615ca48a2ca15460a12ac654774ef927bfdc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] gbuild: update included dep-targets as side effect of target...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4904 -- To view, visit https://gerrit.libreoffice.org/4904 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I753039ed33f5a84104f35990769eddc83e1d0d7e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gbuild: update included dep-targets as side effect of target...
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4904 to look at the new patch set (#2). Change subject: gbuild: update included dep-targets as side effect of targets .. gbuild: update included dep-targets as side effect of targets Make builds in 2 phases: first it ensures that all targets that are included by the makefiles (i.e. the .d files) are up to date, then it restarts and builds everything else. It would be possible to update the .d files in the same build by simply having dependencies from the dep-targets to the corresponding real targets, but that has undesirable effects (8b5a984d45005d3df1c89eae897d6e04612625d8). For a successful build, the .d files can actually be updated as a side effect of other rules in such a way that they will be up-to-date on the next make invocation, thus the restart can be avoided. This optimization will not always work in case of build failures. Change-Id: I753039ed33f5a84104f35990769eddc83e1d0d7e --- M solenv/gbuild/AllLangResTarget.mk M solenv/gbuild/LinkTarget.mk M solenv/gbuild/UnoApiTarget.mk 3 files changed, 39 insertions(+), 15 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/4904/2 -- To view, visit https://gerrit.libreoffice.org/4904 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I753039ed33f5a84104f35990769eddc83e1d0d7e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AllLangResTarget.mk | 14 --
solenv/gbuild/LinkTarget.mk | 24 +++-
solenv/gbuild/UnoApiTarget.mk | 16
3 files changed, 39 insertions(+), 15 deletions(-)
New commits:
commit 4780d94d6d52ff68c72a81bf3e00dbe850995c8c
Author: Michael Stahl
Date: Sun Jul 14 22:29:39 2013 +0200
gbuild: update included dep-targets as side effect of targets
Make builds in 2 phases: first it ensures that all targets that are
included by the makefiles (i.e. the .d files) are up to date, then
it restarts and builds everything else.
It would be possible to update the .d files in the same build by simply
having dependencies from the dep-targets to the corresponding real targets,
but that has undesirable effects (8b5a984d45005d3df1c89eae897d6e04612625d8).
For a successful build, the .d files can actually be updated as a side
effect of other rules in such a way that they will be up-to-date on the
next make invocation, thus the restart can be avoided.
This optimization will not always work in case of build failures.
Change-Id: I753039ed33f5a84104f35990769eddc83e1d0d7e
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 3ad5065..55a8d57 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -227,7 +227,8 @@ define gb_SrsTarget__command_dep
$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+ $(foreach part,$(PARTS),$(call
gb_SrsPartTarget_get_dep_target,$(part && \
$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
&& \
rm -f $${RESPONSEFILE}
endef
@@ -237,7 +238,12 @@ $(call gb_SrsTarget_get_headers_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
+# This recipe actually also builds the dep-target as a side-effect, which
+# is an optimization to reduce incremental build time.
$(call gb_SrsTarget_get_target,%) :
+ifeq ($(gb_FULLDEPS),$(true))
+ $(call gb_SrsTarget__command_dep,$(call
gb_SrsTarget_get_dep_target,$*),$*)
+endif
$(call gb_Output_announce,$*,$(true),SRS,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -246,7 +252,7 @@ $(call gb_SrsTarget_get_target,%) :
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsTarget_get_dep_target,%) : \
$(call gb_Executable_get_runtime_dependencies,concat-deps)
- $(call gb_SrsTarget__command_dep,$@,$*,$^)
+ $(call gb_SrsTarget__command_dep,$@,$*)
endif
define gb_SrsTarget_SrsTarget
@@ -258,6 +264,7 @@ $(call gb_SrsTarget_get_target,$(1)) : PARTS :=
$(call gb_SrsTarget_get_target,$(1)) : $(call
gb_SrsTemplateTarget_get_target,$(1))
$(call gb_SrsTarget_get_clean_target,$(1)) : $(call
gb_SrsTemplateTarget_get_clean_target,$(1))
ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : PARTS :=
-include $(call gb_SrsTarget_get_dep_target,$(1))
endif
@@ -289,6 +296,9 @@ $(call gb_SrsPartTarget_get_target,$(2)) :| $(call
gb_SrsTarget_get_headers_targ
$(call gb_SrsPartTarget_get_target,$(2)) :| $(call
gb_SrsTemplateTarget_get_target,$(1))
$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : PARTS += $(2)
+endif
endef
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index a5c7132..3b64806 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -395,13 +395,13 @@ $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
- $(foreach object,$(3),$(call
gb_CObject_get_dep_target,$(object))) \
- $(foreach object,$(4),$(call
gb_CxxObject_get_dep_target,$(object))) \
- $(foreach object,$(5),$(call
gb_ObjCObject_get_dep_target,$(object)))\
- $(foreach object,$(6),$(call
gb_ObjCxxObject_get_dep_target,$(object)))\
- $(foreach object,$(7),$(call
gb_AsmObject_get_dep_target,$(object)))\
- $(foreach object,$(8),$(call
gb_GenCObject_get_dep_target,$(object))) \
- $(foreach object,$(9),$(call
gb_GenCxxObject_get_dep_target,$(object))) \
+ $(foreach object,$(COBJECTS),$(call
gb_CObject_get_dep_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_dep_target,$(object))) \
+ $(foreach object,$(OBJCOBJECTS),$(call
gb_ObjCObject_get_dep_target,$(object)))\
+ $(foreach object,$(OBJCXXOBJECTS
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3bfe3bfca27dcc4cb00a85c2b30a5a50f5bad689
Author: Tomofumi Yagi
Date: Tue Jul 16 20:53:44 2013 +0900
Add another fallback-path for wilangid.vbs(work it again)
Searching mechanism for wilangid.vbs(commit 265cc57) doesn't work
after commit 7f4a622("stop copying MSVC debug runtime DLLs").
That commit deleted $vsarch environment.
In configure,using $WINDWOS_SDK_ARCH instead of $vsarch will make it work
again(that is still set).
Change-Id: Ia45d30b2a724a36543038b14dd8defc3647ae455
Reviewed-on: https://gerrit.libreoffice.org/4935
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/configure.ac b/configure.ac
index 365391d..566b38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9137,7 +9137,7 @@ the Windows SDK are installed.])
if test -z "$WINDOWS_SDK_WILANGID" -a -n "$WINDOWS_SDK_HOME"; then
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
if ! test -e "$WINDOWS_SDK_WILANGID" ; then
-WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$vsarch/WiLangId.vbs
+
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs
fi
if ! test -e "$WINDOWS_SDK_WILANGID" ; then
AC_MSG_WARN([WiLangId.vbs not found - building translated packages
will fail])
___
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/d762b02a99bacba44964395081dcbc85670194
66/d762b02a99bacba44964395081dcbc85670194 |1 + 1 file changed, 1 insertion(+) New commits: commit ae5c3ea8205d6eb942ce210795fac0fee3121a42 Author: Caolán McNamara Date: Tue Jul 16 13:55:41 2013 +0100 Notes added by 'git notes add' diff --git a/66/d762b02a99bacba44964395081dcbc85670194 b/66/d762b02a99bacba44964395081dcbc85670194 new file mode 100644 index 000..00b55a3 --- /dev/null +++ b/66/d762b02a99bacba44964395081dcbc85670194 @@ -0,0 +1 @@ +ignore: branding ___ 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' - ca/c49d92eba807aae36ef068a3aff3dd8edc6a09
ca/c49d92eba807aae36ef068a3aff3dd8edc6a09 |1 + 1 file changed, 1 insertion(+) New commits: commit 20c1ce6f56345058a868c14de196abb1507ae8ed Author: Caolán McNamara Date: Tue Jul 16 13:55:20 2013 +0100 Notes added by 'git notes add' diff --git a/ca/c49d92eba807aae36ef068a3aff3dd8edc6a09 b/ca/c49d92eba807aae36ef068a3aff3dd8edc6a09 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/ca/c49d92eba807aae36ef068a3aff3dd8edc6a09 @@ -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: cui/source cui/uiconfig
cui/source/tabpages/tparea.cxx |6 cui/uiconfig/ui/transparencytabpage.ui | 301 + 2 files changed, 193 insertions(+), 114 deletions(-) New commits: commit 84f07b98617c35bebc74c0e67d740c2668b6ba7c Author: Caolán McNamara Date: Tue Jul 16 13:49:44 2013 +0100 restore a11y relations within ui format and hack things a little to get the previews to take full width and half height Change-Id: I1cea2ad71ea8cafc3e417ec254515764c0f053f9 diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 60ee318..b5557b0 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -256,12 +256,6 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet get(m_pCtlBitmapPreview,"CTL_BITMAP_PREVIEW"); get(m_pCtlXRectPreview,"CTL_TRANS_PREVIEW"); - -// String accName = String(CUI_RES(STR_EXAMPLE)); -// aCtlBitmapPreview.SetAccessibleName(accName); -// aCtlXRectPreview.SetAccessibleName(accName); -// aMtrTransparent.SetAccessibleRelationLabeledBy( &aRbtTransLinear ); - // main selection m_pRbtTransOff->SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransOffHdl_Impl)); m_pRbtTransLinear->SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransLinearHdl_Impl)); diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui index 4c8e780a..6f38a67 100644 --- a/cui/uiconfig/ui/transparencytabpage.ui +++ b/cui/uiconfig/ui/transparencytabpage.ui @@ -2,27 +2,42 @@ + +100 +1 +10 + + +359 +1 +10 + True False 6 6 +True 0 none True False +True 6 True False +True 12 +True True False +start vertical 6 @@ -30,7 +45,7 @@ True False 6 -6 +12 _No transparency @@ -63,6 +78,9 @@ True True RBT_TRANS_GRADIENT + + + 0 @@ -96,6 +114,9 @@ False ⢠adjustmentPercent + + + 1 @@ -124,24 +145,22 @@ 6 12 - + True False -25 -0 -_End value -True -MTR_TRGR_END_VALUE:0% +⢠+True +adjustmentPercent -0 +1 6 1 1 - + True False ⢠@@ -150,62 +169,58 @@ 1 -6 +5 1 1 - + True False -25 -0 -_Start value -True -MTR_TRGR_START_VALUE:0% +⢠+True +adjustmentPercent -0 -5 +1 +4 1 1 - + True False ⢠True -adjustmentPercent +adjustmentDegrees 1 -
[Libreoffice-commits] core.git: sc/Module_sc.mk
sc/Module_sc.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit b4eac50a7ef85661703b8848ef19198313453f45 Author: LuboÅ¡ LuÅák Date: Tue Jul 16 14:15:17 2013 +0200 try to avoid build breakage with cppunit on android Broken by eef53622798e2e2f81f28ee5e1c82de0d48c149c , and I've had enough of tinderbox mails during the last week. Change-Id: Iab0fe0363e8ca3212eb673ae1da9492140140bc3 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 29e53e9..35f1fc1 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -16,10 +16,15 @@ $(eval $(call gb_Module_add_targets,sc,\ Library_scd \ Library_scfilt \ Library_scui \ - Library_scqahelper \ UIConfig_scalc \ )) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,sc,\ + Library_scqahelper \ +)) +endif + ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Module_add_targets,sc,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - instsetoo_native/res instsetoo_native/util svx/source
dev/null |binary
instsetoo_native/util/makefile.mk | 15 ---
svx/source/svdraw/svdxcgv.cxx | 11 ++-
3 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 66d762b02a99bacba44964395081dcbc85670194
Author: Jürgen Schmidt
Date: Tue Jul 16 11:13:13 2013 +
remove obsolete installer image to avoid confusion
diff --git a/instsetoo_native/res/nologoinstall.bmp
b/instsetoo_native/res/nologoinstall.bmp
deleted file mode 100755
index 2c08bfb..000
Binary files a/instsetoo_native/res/nologoinstall.bmp and /dev/null differ
commit cac49d92eba807aae36ef068a3aff3dd8edc6a09
Author: Jürgen Schmidt
Date: Tue Jul 16 11:12:09 2013 +
merge fix from branch aoo400 to ensure correct installer image on windows
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index a4839dd..9f18a6c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -143,20 +143,17 @@ sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
-#MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
.IF "$(BUILD_SPECIAL)"!=""
MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
-#MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
@@ -267,27 +264,15 @@ $(BIN)$/dev$/intro.zip :
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
-# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
-# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.*
$(MSIOFFICETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.*
$(MSILANGPACKTEMPLATEDIR)$/Binary
-# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.*
$(MSIURETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.*
$(MSISDKOOTEMPLATEDIR)$/Binary
-$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-$(COPY) $(PRJ)$/res$/nologoinstall.bmp
$(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-$(COPY) $(PRJ)$/res$/nologoinstall.bmp
$(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-# $(COPY) $(PRJ)$/res$/nologoinstall.bmp
$(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-$(COPY) $(PRJ)$/res$/nologoinstall.bmp
$(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
commit 4dc54d2ec37bc1595eb85548f5e3c6d2add2b10a
Author: Armin Le Grand
Date: Tue Jul 16 10:55:54 2013 +
i122753 Force SwapIn for BitmapObjects which are part of a conversion to
BitmapEx
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 3629e54..b67aca7 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -574,8 +574,17 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool
bNoVDevIfOneBmpMarked) const
for(sal_uInt32 a(0); a < nCount; a++)
{
+SdrObject* pCandidate = aSdrObjects[a];
+SdrGrafObj* pSdrGrafObj = dynamic_cast< SdrGrafObj*
>(pCandidate);
+
+if(pSdrGrafObj)
+{
+// #122753# To ensure existance of graphic content,
force swap in
+pSdrGrafObj->ForceSwapIn();
+}
+
xPrimitives[a] = new
drawinglayer::primitive2d::GroupPrimitive2D(
-
aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence());
+
pCandidate->GetViewContact().getViewIndependentPrimitive2DSequence());
}
// get logic range
___
Lib
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/shared/01/0119.xhp | 29 +++-- 2 files changed, 15 insertions(+), 21 deletions(-) New commits: commit c5705ccf11d34e751687b9513b0988659063 Author: Caolán McNamara Date: Tue Jul 16 12:54:35 2013 +0100 update help ids for versions of dialog .ui conversion Change-Id: Ic73478456ef582616290f33f08017abe667d0315 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 3fff662..4a24091 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6797,7 +6797,6 @@ sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237, sfx2_CheckBox_DLG_NEW_FILE_CB_NUM_STYLE,1107379236, sfx2_CheckBox_DLG_NEW_FILE_CB_PAGE_STYLE,1107379235, sfx2_CheckBox_DLG_NEW_FILE_CB_TEXT_STYLE,1107379233, -sfx2_CheckBox_DLG_VERSIONS_CB_SAVEONCLOSE,1112687619, sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF,557136, sfx2_CheckBox_RID_DLG_SEARCH_CB_BACKWARDS,2187084816, sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814, @@ -6829,18 +6828,12 @@ sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812, sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203, sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824, sfx2_ModalDialog_DLG_HELP_ADDBOOKMARK,1083899904, -sfx2_ModalDialog_DLG_VERSIONS,1112686592, sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352, sfx2_ModalDialog_RID_URLOPEN,1112571904, sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040, sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008, sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807, sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822, -sfx2_PushButton_DLG_VERSIONS_PB_COMPARE,1112691217, -sfx2_PushButton_DLG_VERSIONS_PB_DELETE,1112691205, -sfx2_PushButton_DLG_VERSIONS_PB_OPEN,1112691206, -sfx2_PushButton_DLG_VERSIONS_PB_SAVE,1112691202, -sfx2_PushButton_DLG_VERSIONS_PB_VIEW,1112691213, sfx2_PushButton_RID_DLG_SEARCH_PB_FIND,2187088401, sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711, sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830, diff --git a/source/text/shared/01/0119.xhp b/source/text/shared/01/0119.xhp index 438916b..fa60a53 100644 --- a/source/text/shared/01/0119.xhp +++ b/source/text/shared/01/0119.xhp @@ -32,6 +32,7 @@ versions;file saving as, restriction + Versions Saves and organizes multiple versions of the current document in the same file. You can also open, delete, and compare previous versions. @@ -41,31 +42,31 @@ If you save a copy of a file that contains version information (by choosing File - Save As), the version information is not saved with the file. New versions Set the options for saving a new version of the document. - + Save New Version -Saves the current state of the document as a new version. If you want, you can also enter comments in the Insert Version Comment dialog before you save the new version. +Saves the current state of the document as a new version. If you want, you can also enter comments in the Insert Version Comment dialog before you save the new version. Insert Version Comment Enter a comment here when you are saving a new version. If you clicked Show to open this dialog, you cannot edit the comment. - + Always save version when closing -If you have made changes to your document, $[officename] automatically saves a new version when you close the document. +If you have made changes to your document, $[officename] automatically saves a new version when you close the document. If you save the document manually, do not change the document after saving, and then close, no new version will be created.issue 12653 - + Existing versions -Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments. +Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments. - + Open -Opens the selected version in a read-only window. - +Opens the selected version in a read-only window. + Show -Displays the entire comment for the selected version. - +Displays the entire comment for the selected version. + Delete -Deletes the selected version. - +Deletes the selected version. + Compare -Compare the changes that were made in each version. If you want, you can Accept or Reject Changes. +Compare the changes that were made in each version. If you want, you can Accept or Reject Changes. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32527be0677a8fa971ebbf39ca9cab9c5a3687fb Author: Caolán McNamara Date: Tue Jul 16 12:54:35 2013 +0100 Updated core Project: help c5705ccf11d34e751687b9513b0988659063 diff --git a/helpcontent2 b/helpcontent2 index cd1389b..c57 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cd1389b4c35e4e028b1e433246093cf2f1f13b42 +Subproject commit c5705ccf11d34e751687b9513b0988659063 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgstyleattributes.cxx | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 07ec224acd694e2bae34df818fde6b952bf03e8f
Author: Armin Le Grand
Date: Mon Jul 15 14:22:12 2013 +
Resolves: #i122724# Better handling of line-only paths
(cherry picked from commit 1898f94578f266de42f92602a36518fb12bacf5a)
Change-Id: I3033197e7c59a829c012b84c1d4cbaca7d155d2a
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index d9e99e5..511872e 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -988,12 +988,9 @@ namespace svgio
const basegfx::B2DPolyPolygon& rPath,
drawinglayer::primitive2d::Primitive2DSequence& rTarget) const
{
-const bool bIsLine(1 == rPath.count()
-&& !rPath.areControlPointsUsed()
-&& 2 == rPath.getB2DPolygon(0).count());
-
if(!rPath.count())
{
+// no geometry at all
return;
}
@@ -1001,13 +998,7 @@ namespace svgio
if(aGeoRange.isEmpty())
{
-return;
-}
-
-if(!bIsLine && // not for lines
-(basegfx::fTools::equalZero(aGeoRange.getWidth())
-|| basegfx::fTools::equalZero(aGeoRange.getHeight(
-{
+// no geometry range
return;
}
@@ -1015,11 +1006,21 @@ namespace svgio
if(basegfx::fTools::equalZero(fOpacity))
{
+// not visible
return;
}
+// check if it's a line
+const bool
bNoWidth(basegfx::fTools::equalZero(aGeoRange.getWidth()));
+const bool
bNoHeight(basegfx::fTools::equalZero(aGeoRange.getHeight()));
+const bool bIsTwoPointLine(1 == rPath.count()
+&& !rPath.areControlPointsUsed()
+&& 2 == rPath.getB2DPolygon(0).count());
+const bool bIsLine(bIsTwoPointLine || bNoWidth || bNoHeight);
+
if(!bIsLine)
{
+// create fill
basegfx::B2DPolyPolygon aPath(rPath);
const bool bNeedToCheckClipRule(SVGTokenPath ==
mrOwner.getType() || SVGTokenPolygon == mrOwner.getType());
const bool bClipPathIsNonzero(!bIsLine && bNeedToCheckClipRule
&& mbIsClipPathContent && FillRule_nonzero == maClipRule);
@@ -1034,6 +1035,7 @@ namespace svgio
add_fill(aPath, rTarget, aGeoRange);
}
+// create stroke
add_stroke(rPath, rTarget, aGeoRange);
// Svg supports markers for path, polygon, polyline and line
___
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' - 18/98f94578f266de42f92602a36518fb12bacf5a
18/98f94578f266de42f92602a36518fb12bacf5a |1 + 1 file changed, 1 insertion(+) New commits: commit 367bfa0dc6333b841c36f13a4ce4805c3131c009 Author: Caolán McNamara Date: Tue Jul 16 12:50:37 2013 +0100 Notes added by 'git notes add' diff --git a/18/98f94578f266de42f92602a36518fb12bacf5a b/18/98f94578f266de42f92602a36518fb12bacf5a new file mode 100644 index 000..3919e74 --- /dev/null +++ b/18/98f94578f266de42f92602a36518fb12bacf5a @@ -0,0 +1 @@ +merged as: 07ec224acd694e2bae34df818fde6b952bf03e8f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
sysui CustomTarget_solaris.mk not working
During install create phase, the sysui CustomaTarget_solaris.mk rule to create the desktop integration tar.gz is never invoked: $(solaris_WORKDIR)/%-desktop-integration.tar.gz: .. So build fails when trying to cp this file later. I tried to debug the problem but I still cannot figure out why that rule is never invoked. Also, I cannot understand why the Module_sysui.mk always runs slackware even when not building for slackware: $(eval $(call gb_Module_add_targets,sysui,\ CustomTarget_share \ CustomTarget_slackware \ Package_share \ Package_desktop \ $(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) other targets are considered, while slackware is always built. thanks for any help! Gabriele. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - vcl/inc vcl/win
vcl/inc/win/saldata.hxx|2 +-
vcl/win/source/app/saldata.cxx |5 +++--
vcl/win/source/gdi/salprn.cxx |2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit bf352cd0ed5a94859f9163fcaa2089a93c9e938e
Author: Michael Stahl
Date: Fri Jul 12 23:13:10 2013 +0200
fdo#66811: vcl: fix broken OUString with length STRING_LEN
ImplSalGetUniString was wrongly converted and constructs OUString with
invalid length in WinSalGraphics::CreateFontSubset; this is then
implicitly converted to an empty UniString so the font names are
missing in the PDF files generated on Windows.
(regression from 9e310cc32923ceb4b18d97ce68d54a339b935f01)
Change-Id: I1603e62cf18f353f3d7de322b9111a173dc6b225
(cherry picked from commit 82f742f65d35896c69be38fa3b1c78a6f71c)
Reviewed-on: https://gerrit.libreoffice.org/4875
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 6089121ebd075bb6422d33d6bff69dff2e88efb2)
Reviewed-on: https://gerrit.libreoffice.org/4932
Reviewed-by: David Tardon
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 4361448..fdf2faf 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -196,7 +196,7 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT
nDispatchResult );
void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont );
rtl_TextEncoding ImplSalGetSystemEncoding();
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen =
STRING_LEN );
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1);
int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
#define SAL_FRAME_WNDEXTRA sizeof( DWORD )
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 2a3ea09..fc99674 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -44,9 +44,10 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
// ---
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
{
-return OUString( pStr, nLen, ImplSalGetSystemEncoding(),
+return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen,
+ ImplSalGetSystemEncoding(),
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 113fb18..94af77c 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -266,7 +266,7 @@ OUString WinSalInstance::GetDefaultPrinter()
char* pTmp = pBuf;
while ( *pTmp && (*pTmp != ',') )
pTmp++;
-return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) );
+return ImplSalGetUniString( pBuf, static_cast(pTmp-pBuf) );
}
else
return OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - svx/source
svx/source/unodraw/unoshape.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 2ab2d6b6f8930459e992aa4d856ce8cb59f2b87b
Author: David Tardon
Date: Mon Jul 15 12:23:40 2013 +0200
fdo#57631 fix collection of property states
Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25
(cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766)
Signed-off-by: David Tardon
Reviewed-on: https://gerrit.libreoffice.org/4911
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
Reviewed-by: Eike Rathke
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5aee667..57270ea 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3030,16 +3030,8 @@ uno::Sequence< beans::PropertyState > SAL_CALL
SvxShape::getPropertyStates( cons
uno::Sequence< beans::PropertyState > aRet( nCount );
beans::PropertyState* pState = aRet.getArray();
-if( mpImpl->mpMaster )
-{
-for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ )
-pState[nIdx] = mpImpl->mpMaster->getPropertyState( pNames[nIdx] );
-}
-else
-{
-for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ )
-pState[nIdx] = _getPropertyState( pNames[nIdx] );
-}
+for( sal_Int32 nIdx = 0; nIdx < nCount; nIdx++ )
+pState[nIdx] = getPropertyState( pNames[nIdx] );
return aRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
setup_native patch for illumos/solaris
Here is a patch for the SOLARIS parts in CustomTarget_scripts.mk, probably an old way to run install_create.pl, not updated for Solaris. Gabriele. sonicle-setup_native-illumos.patch Description: binary/octet-stream ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building LO 4.0.4.2 on illumos based OS
For now, it's ok to have the build go through, so I can see if I can reach a working LO. Then I'll dig again the NSS problem, and see if I can support it. Now: build reached the "install creation" phase! But: something went wrong. USAGE: /sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/setup_native/scripts/install_create.pl : the start shell script, located next to this perl script : the library file, that is included into the shell script : the target shellscript chmod: cannot access '/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CustomTarget/setup_native/scripts/install': No such file or directory make[2]: *** [/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CustomTarget/setup_native/scripts/install] Error 1 As if the install creation did not pass arguments to the perl script. Actually, I don't want it to create an installer for solaris via packages. What I want is to issue some kind of "gmake install" to let it place everything inside a prototype area, through classic configure switches. This will let me publish the package in my IPS repository, as for any SunOS 5.11 based system. Any idea how to achieve this? Gabriele. -- Da: Michael Stahl A: Gabriele Bulfon Cc: libreoffice-dev michael.me...@suse.com Rene Engelhard Data: 16 luglio 2013 10.43.01 CEST Oggetto: Re: Building LO 4.0.4.2 on illumos based OS On 16/07/13 08:09, Gabriele Bulfon wrote: Now I noticed the config.log of xmlsec shows the configure switches like this: ./configure --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --without-openssl This is why it's not picking up my system openssl not the other crypto libs. I bet it's trying to build it only with NSS libs, but they're not passed correctly (they resides in /usr/lib/mps in my environment) from base env. Is it absolutely necessary that it builds without those crypto libs? i'm not entirely sure but i think that the ODF encryption support (which is the only use of libxmlsec) on Unixes is implemented by using keys added by Firefox/Thunderbird UI to their user profiles; there is no UI in LO for adding/removing keys. probably only NSS can read the Firefox/Thunderbird key database, so i'm afraid that if you build xmlsec with anything other than NSS it won't work in practice. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
libxmlsec patch for building on illumos/solaris
Hi, I managed to patch libxmlsec mk files to work on XStreamOS/illumos. I had to disable nss/nspr and use installed openssl instead, as for android. Here is the patch that built correctly. Gabriele. sonicle-libxmlsec-illumos.patch Description: binary/octet-stream ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 +++ 1 file changed, 7 insertions(+) New commits: commit afb41ff0c5bfc5402c1a5522a55998d6c023b248 Author: LuboÅ¡ LuÅák Date: Tue Jul 16 09:53:29 2013 +0200 warn in configure about using ccache+clang without CCACHE_CPP2 set - causes warnings about unused -I options, because they are preprocessing options and Clang complains that they are unused in pure compilation - Clang supresses some warnings from expansions of macros in system headers, but those would be already expanded and thus warned about - Clang prints relevant source lines with errors/warnings in them and would show them preprocessed (this should actually apply to GCC4.8+ too) Change-Id: I02c86c43a657d078e347e4ecd5c1e2ff07db2886 diff --git a/configure.ac b/configure.ac index cc439e0..365391d 100644 --- a/configure.ac +++ b/configure.ac @@ -2896,6 +2896,13 @@ if test "$GCC" = "yes"; then fi AC_SUBST(COM_GCC_IS_CLANG) +if test "$CCACHE" != "" -a "$COM_GCC_IS_CLANG" = TRUE; then +if test -z "$CCACHE_CPP2"; then +AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings.]) +add_warning "Using ccache with Clang without CCACHE_CPP2 set causes spurious warnings." +fi +fi + # === # check various GCC options that Clang does not support now but maybe # will somewhen in the future, check them even for GCC, so that the ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - oox/source sw/qa sw/source
oox/source/vml/vmltextboxcontext.cxx | 17 +---
sw/qa/extras/ooxmlexport/data/fdo66929.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 16 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 37 ++-
4 files changed, 60 insertions(+), 10 deletions(-)
New commits:
commit db610b4a9202a9bb6393b1bcfc7dd56d21bd8112
Author: Miklos Vajna
Date: Tue Jul 16 09:43:56 2013 +0200
DocxAttributeOutput: avoid 'a' prefix for double
Change-Id: I1601f2d2926ca62aae8e7c48b1b2147ebed01002
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 768235e..0169cf8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4966,33 +4966,33 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem&
rBox )
}
// v:textbox's inset attribute: inner margin values for textbox text -
write only non-default values
-double aDistanceLeftTwips = double(rBox.GetDistance(BOX_LINE_LEFT));
-double aDistanceTopTwips = double(rBox.GetDistance(BOX_LINE_TOP));
-double aDistanceRightTwips = double(rBox.GetDistance(BOX_LINE_RIGHT));
-double aDistanceBottomTwips =
double(rBox.GetDistance(BOX_LINE_BOTTOM));
+double fDistanceLeftTwips = double(rBox.GetDistance(BOX_LINE_LEFT));
+double fDistanceTopTwips = double(rBox.GetDistance(BOX_LINE_TOP));
+double fDistanceRightTwips = double(rBox.GetDistance(BOX_LINE_RIGHT));
+double fDistanceBottomTwips =
double(rBox.GetDistance(BOX_LINE_BOTTOM));
// Convert 'TWIPS' to 'INCH' (because in Word the default values are
in Inches)
-double aDistanceLeftInch = aDistanceLeftTwips / 1440;
-double aDistanceTopInch = aDistanceTopTwips / 1440;
-double aDistanceRightInch = aDistanceRightTwips / 1440;
-double aDistanceBottomInch = aDistanceBottomTwips / 1440;
+double fDistanceLeftInch = fDistanceLeftTwips / 1440;
+double fDistanceTopInch = fDistanceTopTwips / 1440;
+double fDistanceRightInch = fDistanceRightTwips / 1440;
+double fDistanceBottomInch = fDistanceBottomTwips / 1440;
// This code will write ONLY the non-default values. The values are in
'left','top','right','bottom' order.
// so 'bottom' is checked if it is default and if it is non-default -
all the values will be written
// otherwise - 'right' is checked if it is default and if it is
non-default - all the values except for 'bottom' will be written
// and so on.
OStringBuffer aInset;
-if(!aInset.isEmpty() || aDistanceBottomInch != double(0.05))
-aInset.insert(0, "," + OString::number(aDistanceBottomInch) +
"in");
+if(!aInset.isEmpty() || fDistanceBottomInch != double(0.05))
+aInset.insert(0, "," + OString::number(fDistanceBottomInch) +
"in");
-if(!aInset.isEmpty() || aDistanceRightInch != double(0.1))
-aInset.insert(0, "," + OString::number(aDistanceRightInch) + "in");
+if(!aInset.isEmpty() || fDistanceRightInch != double(0.1))
+aInset.insert(0, "," + OString::number(fDistanceRightInch) + "in");
-if(!aInset.isEmpty() || aDistanceTopInch != double(0.05))
-aInset.insert(0, "," + OString::number(aDistanceTopInch) + "in");
+if(!aInset.isEmpty() || fDistanceTopInch != double(0.05))
+aInset.insert(0, "," + OString::number(fDistanceTopInch) + "in");
-if(!aInset.isEmpty() || aDistanceLeftInch != double(0.1))
-aInset.insert(0, OString::number(aDistanceLeftInch) + "in");
+if(!aInset.isEmpty() || fDistanceLeftInch != double(0.1))
+aInset.insert(0, OString::number(fDistanceLeftInch) + "in");
if (!aInset.isEmpty())
m_pTextboxAttrList->add(XML_inset, aInset.makeStringAndClear());
commit 1a37ca65b896a5ba100d46c7cde0793f62bc546b
Author: Adam Co
Date: Mon Jul 15 18:40:08 2013 +0300
fdo#66929: fix for default textbox inset values
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I0e9fa5e73e802f85f02c3fcc5c276ed0c1cb2a58
diff --git a/oox/source/vml/vmltextboxcontext.cxx
b/oox/source/vml/vmltextboxcontext.cxx
index d91c66a..fbb701f 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -171,18 +171,27 @@ TextBoxContext::TextBoxContext( ContextHandler2Helper&
rParent, TextBox& rTextBo
{
OUString inset = rAttribs.getString( XML_inset ).get();
OUString value;
-ConversionHelper::separatePair( value, inset, inset, ',' );
+OUString remainingStr;
+
+ConversionHelper::separatePair( value, remainingStr, inset, ',' );
rTextBox.borderDistanceLeft = ConversionHelper::decodeMeasureToHmm(
graphicHelper,
value.isEmpty() ? "0.1in" : value, 0, false, false );
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Views.xcu |7 +++ 1 file changed, 7 insertions(+) New commits: commit 1f830323da936ca6ffd1751f1bd9845b9f431730 Author: Jan Holesovsky Date: Mon Jul 15 17:32:40 2013 +0200 Enable sidebar by default when the Experimental Sidebar is put to 'on'. Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775 Reviewed-on: https://gerrit.libreoffice.org/4927 Reviewed-by: Petr Mladek Tested-by: Petr Mladek Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara Reviewed-by: Andras Timar diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu index bd3a06b..65d02dd 100644 --- a/officecfg/registry/data/org/openoffice/Office/Views.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu @@ -24,5 +24,12 @@ false + + + + +true + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
