[Libreoffice-commits] .: ucb/source
ucb/source/ucp/gio/gio_provider.cxx |6 ++ ucb/source/ucp/odma/odma_provider.cxx |5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) New commits: commit f7d571d2eefea079be3d89f3253ed90cbd9fa07f Author: David Tardon dtar...@redhat.com Date: Wed Mar 21 07:37:51 2012 +0100 this requires string literals now diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 62e8d98..14bdbd0 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -94,10 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, com::sun::star::ucb::XContentProvider ); XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - com.sun.star.comp.GIOContentProvider )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - com.sun.star.ucb.GIOContentProvider )) ); + com.sun.star.comp.GIOContentProvider, + com.sun.star.ucb.GIOContentProvider ); ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index da09d11..702851f 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -149,9 +149,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // @@@ Adjust implementation name. Keep the prefix com.sun.star.comp.! // @@@ Adjust service name. XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( -com.sun.star.comp.odma.ContentProvider )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) ); +com.sun.star.comp.odma.ContentProvider, + ODMA_CONTENT_PROVIDER_SERVICE_NAME ); //= // ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unodraw.cxx | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 28253b4d826a8a008349fa66c902028e3f5a907b
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Mar 21 09:45:25 2012 +0100
SwXShape::setPropertyValue: OSL_ENSURE - SAL_WARN_IF
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 834d14d..ea49842 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1174,7 +1174,7 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
else if(RES_OPAQUE == pEntry-nWID)
{
SvxShape* pSvxShape = GetSvxShape();
-OSL_ENSURE(pSvxShape, No SvxShape found!);
+SAL_WARN_IF(pSvxShape, sw.uno, No SvxShape found!);
if(pSvxShape)
{
SdrObject* pObj = pSvxShape-GetSdrObject();
@@ -1220,15 +1220,15 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
//To prevent this the connection between
format and attribute has to be broken before.
const SwPosition *pPos =
aAnchor.GetCntntAnchor();
SwTxtNode *pTxtNode =
pPos-nNode.GetNode().GetTxtNode();
-OSL_ENSURE( pTxtNode-HasHints(), Missing
FlyInCnt-Hint. );
+SAL_WARN_IF( pTxtNode-HasHints(), sw.uno,
Missing FlyInCnt-Hint. );
const xub_StrLen nIdx =
pPos-nContent.GetIndex();
SwTxtAttr * const pHnt =
pTxtNode-GetTxtAttrForCharAt(
nIdx, RES_TXTATR_FLYCNT );
-OSL_ENSURE( pHnt pHnt-Which() ==
RES_TXTATR_FLYCNT,
-Missing FlyInCnt-Hint. );
-OSL_ENSURE( pHnt
pHnt-GetFlyCnt().GetFrmFmt() == pFmt,
-Wrong TxtFlyCnt-Hint. );
+SAL_WARN_IF( pHnt pHnt-Which() ==
RES_TXTATR_FLYCNT,
+sw.uno, Missing FlyInCnt-Hint.
);
+SAL_WARN_IF( pHnt
pHnt-GetFlyCnt().GetFrmFmt() == pFmt,
+sw.uno, Wrong TxtFlyCnt-Hint.
);
const_castSwFmtFlyCnt(pHnt-GetFlyCnt())
.SetFlyFmt();
@@ -1237,7 +1237,7 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
RES_TXTATR_FLYCNT, nIdx );
//create a new one
SwTxtNode *pNd =
pInternalPam-GetNode()-GetTxtNode();
-OSL_ENSURE( pNd, Cursor not at TxtNode. );
+SAL_WARN_IF( pNd, sw.uno, Cursor not at
TxtNode. );
SwFmtFlyCnt aFmt( pFmt );
pNd-InsertItem(aFmt, pInternalPam-GetPoint()
-nContent.GetIndex(), 0 );
@@ -1306,15 +1306,15 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
//To prevent this the connection between format
and attribute has to be broken before.
const SwPosition *pPos =
rOldAnchor.GetCntntAnchor();
SwTxtNode *pTxtNode =
pPos-nNode.GetNode().GetTxtNode();
-OSL_ENSURE( pTxtNode-HasHints(), Missing
FlyInCnt-Hint. );
+SAL_WARN_IF( pTxtNode-HasHints(), sw.uno,
Missing FlyInCnt-Hint. );
const xub_StrLen nIdx = pPos-nContent.GetIndex();
SwTxtAttr * const pHnt =
pTxtNode-GetTxtAttrForCharAt(
nIdx, RES_TXTATR_FLYCNT );
-OSL_ENSURE( pHnt pHnt-Which() ==
RES_TXTATR_FLYCNT,
-Missing FlyInCnt-Hint. );
-OSL_ENSURE( pHnt pHnt-GetFlyCnt().GetFrmFmt()
== pFlyFmt,
-Wrong TxtFlyCnt-Hint. );
+SAL_WARN_IF( pHnt pHnt-Which() ==
RES_TXTATR_FLYCNT,
+sw.uno, Missing FlyInCnt-Hint. );
+SAL_WARN_IF( pHnt pHnt-GetFlyCnt().GetFrmFmt()
== pFlyFmt,
+sw.uno, Wrong TxtFlyCnt-Hint. );
const_castSwFmtFlyCnt(pHnt-GetFlyCnt())
.SetFlyFmt();
@@ -1349,7 +1349,7 @@ void SwXShape::setPropertyValue(const
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit e6aa2b67d4c0f1a65fcddabb77186c75a3ae1c1a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 10:52:07 2012 +0100 Remove unused define diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index de99aa6..e443313 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -416,8 +416,6 @@ ZipFile::~ZipFile() delete m_pStream; } -#define CHUNK 16384 - /** Provides an interface to read the uncompressed data of a content of the zip file @precondThe specified content must exist in this file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/inc tubes/qa tubes/README tubes/source
tubes/README | 30 ++
tubes/inc/tubes/conference.hxx | 12
tubes/inc/tubes/manager.hxx| 49 +
tubes/inc/tubes/packet.hxx | 16 +
tubes/qa/test_manager.cxx | 38 +++--
tubes/source/conference.cxx| 113 +
tubes/source/manager.cxx | 82 +
7 files changed, 265 insertions(+), 75 deletions(-)
New commits:
commit c8ff5cb3af1566a1b25f0c573df8dbf0c8abcb7b
Author: Eike Rathke er...@redhat.com
Date: Tue Mar 20 20:24:33 2012 +0100
restructure things to one account manager and one connection
tubes are offered and accepted now, sending/receiving works
YAY! Thanks to Will Thompson from Collabora.
diff --git a/tubes/README b/tubes/README
index 20cdcfa..3527a72 100644
--- a/tubes/README
+++ b/tubes/README
@@ -8,7 +8,7 @@ the same TeleConference abstraction.
To enable configure LibO with --enable-telepathy
-Status 2012-03-16:
+Status 2012-03-20:
* no LibO code depends on this module yet, so it is not built in a regular
build, even if configured with --enable-telepathy, so cd tubes and make here
@@ -27,19 +27,25 @@ Status 2012-03-16:
* libo1 and libo2 must be contacts/buddies of each other
* both accounts need to be online in Empathy
-* very nasty GMainLoop handling for cppunittest, MAYBE we could get rid of
- that in a real LibO, this might be responsible for some ugly behaviour
-* contact channels seem to be successfully setup
-* the client's callback TeleManager_DBusChannelHandler setup with
- TeleManager::connect() does not appear to get ever called
-* hence the tube offer triggered by TeleManager_ChannelReadyHandler is never
- accepted
-* unsure if the uniquify setup with tp_simple_handler_new_with_factory() would
- work at all, hence trying to have one instance un-uniquified, but to no
- avail
+* very nasty GMainLoop handling for cppunittest, HOPEFULLY we will get rid of
+ that in a real LibO
+* working:
+ * contact channels are setup
+ * tube is offered/accepted
+ * packets are sent and received
-TODOs (once those basic problems are solved)
+TODO:
+
+* cleanup code to use a refcounted single instance thats holds mpAccountManager
+ and stuff and actually releases them, instead of statics
+* TeleManager should be a single instance, not holding any account information;
+ instead, the start...Session() methods should also get the account passed
+* implement master/slave mode in 1-1 buddy conferences, master would do strong
+ ordering
+
+
+other TODOs:
* associate a document with a conference
* use SfxObjectShell as an abstraction and broadcast incoming changes?
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index db78cd5..8f68333 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -62,6 +62,9 @@ public:
*/
boolsendPacket( TelePacket rPacket ) const;
+/** Pop a received packet. */
+boolpopPacket( TelePacket rPacket );
+
/** Queue incoming data as TelePacket */
voidqueue( const char* pDBusSender, const char*
pPacket, int nSize );
@@ -75,10 +78,17 @@ public:
boolofferTube();
boolsetTube( DBusConnection* pTube );
boolacceptTube( const char* pAddress );
+/// got tube accepted on other end as well?
+boolisTubeOpen() const { return meTubeChannelState ==
TP_TUBE_CHANNEL_STATE_OPEN; }
// Only for callbacks.
voidsetTubeOfferedHandlerInvoked( bool b ) {
mbTubeOfferedHandlerInvoked = b; }
boolisTubeOfferedHandlerInvoked() const { return
mbTubeOfferedHandlerInvoked; }
+voidsetTubeChannelStateChangedHandlerInvoked( bool b )
+{ mbTubeChannelStateChangedHandlerInvoked = b;
}
+boolisTubeChannelStateChangedHandlerInvoked() const
+{ return
mbTubeChannelStateChangedHandlerInvoked; }
+voidsetTubeChannelState( TpTubeChannelState eState ) {
meTubeChannelState = eState; }
private:
@@ -88,8 +98,10 @@ private:
TpChannel* mpChannel;
DBusConnection* mpTube;
TelePacketQueue maPacketQueue;
+TpTubeChannelState meTubeChannelState;
boolmbTubeOfferedHandlerInvoked : 1;
+boolmbTubeChannelStateChangedHandlerInvoked : 1;
// hide from the public
using boost::enable_shared_from_thisTeleConference::shared_from_this;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index b47455a..92fcc6b 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -118,15 +118,29 @@ public:
boolstartBuddySession( const
[Libreoffice-commits] .: 2 commits - solenv/bin
solenv/bin/build.pl |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 4c40593e3e936e6a966410ab807df4b775fc2464
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:40:42 2012 +0200
$retry_counter and the RETRY label are now unused
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index f59d675..e5e009f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1814,7 +1814,6 @@ sub run_job {
my ($job, $path, $registered_name) = @_;
my $job_to_do = $job;
my $error_code = 0;
-my $retry_counter = 10;
print $registered_name\n;
return 0 if ( $show );
@@ -1838,7 +1837,7 @@ sub run_job {
system($perl $mkout);
};
}
-RETRY:
+
open (MAKE, $job_to_do 21 |) or return 8;
open (LOGFILE, $log_file) or return 8;
while (MAKE) { print LOGFILE $_; print $_ }
commit 5e553b1ee5d8266b14c1f553d310dd634ae3fb84
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Mar 21 12:27:08 2012 +0200
GUI=WIN used to mean 16-bit Windows, I think, so kill that crack
Also the running of grep inside the test for GUI = WIN was a bit weird,
what was it supposed to grep? Standard input?
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 1b8ed64..f59d675 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1076,7 +1076,6 @@ sub pick_prj_to_build {
sub check_platform {
my $platform = shift;
return 1 if ($platform eq 'all');
-return 1 if (($ENV{GUI} eq 'WIN') ($platform eq 'w'));
return 1 if (($ENV{GUI} eq 'UNX') ($platform eq 'u'));
return 1 if (($ENV{GUI} eq 'WNT')
(($platform eq 'w') || ($platform eq 'n')));
@@ -1848,11 +1847,6 @@ RETRY:
close LOGFILE;
if ( $error_code != 0)
{
-if ($ENV{GUI} eq 'WIN' $retry_counter 0)
-{
-$retry_counter -= 1;
-system('grep Error 126\$') goto RETRY;
-}
system(echo \log for $path\ $build_error_log);
system(cat $log_file $build_error_log);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source sw/source
svx/source/tbxctrls/tbcontrl.cxx | 12
svx/source/tbxctrls/tbxcolorupdate.cxx | 16 ++--
sw/source/ui/docvw/edtwin.cxx |8
3 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit ae7c80640df922630060b82ffa91fd7db2e4d6d7
Author: Winfried Donkers o...@dci-electronics.nl
Date: Sun Mar 11 09:05:02 2012 +0100
fdo#45671 set initial color for split buttons
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0ecf87d..cb56fac 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2231,6 +2231,14 @@ void SvxColorToolBoxControl::StateChanged(
//
// class SvxColorExtToolBoxControl
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
sal_uInt16 nSlotId,
@@ -2252,11 +2260,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
case SID_ATTR_CHAR_COLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:Color )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_ATTR_CHAR_COLOR2:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharColorExt )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_RED;
break;
case SID_BACKGROUND_COLOR:
@@ -2264,11 +2274,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
default:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharBackgroundExt )));
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+mLastColor = COL_YELLOW;
break;
case SID_FRAME_LINECOLOR:
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:FrameLineColor )));
nMode = 0;
+mLastColor = COL_BLUE;
break;
}
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 1b567d4..c62ce1b 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -44,6 +44,14 @@ namespace svx
//
//= ToolboxButtonColorUpdater
//
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+ (SwEditWin::aTextBackColor and SwEditWin::aTextBackColor)
+ */
ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
sal_uInt16 nId,
@@ -64,13 +72,17 @@ namespace svx
{
case SID_ATTR_CHAR_COLOR :
case SID_ATTR_CHAR_COLOR2 :
-Update( COL_BLACK );
+Update( COL_RED );
+break;
+case SID_FRAME_LINECOLOR :
+Update( COL_BLUE );
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+case SID_BACKGROUND_COLOR :
Update( COL_YELLOW );
break;
default :
-Update( COL_GRAY );
+Update( COL_TRANSPARENT );
}
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bb2daba..5aabb08 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -176,6 +176,14 @@ QuickHelpData* SwEditWin::pQuickHlpData = 0;
longSwEditWin::nDDStartPosY = 0;
longSwEditWin::nDDStartPosX = 0;
+/* Note:
+ The initial color shown on the button is set in
/core/svx/source/tbxctrls/tbxcolorupdate.cxx
+ (ToolboxButtonColorUpdater::ToolboxButtonColorUpdater()) .
+ The initial color used by the button is set in
/core/svx/source/tbxcntrls/tbcontrl.cxx
+ (SvxColorExtToolBoxControl::SvxColorExtToolBoxControl())
+ and in case of writer for text(background)color also in
/core/sw/source/ui/docvw/edtwin.cxx
+
[Libreoffice-commits] .: 2 commits - animations/prj chart2/prj clucene/prj configmgr/qa connectivity/inc connectivity/qa connectivity/source connectivity/util connectivity/workben cppuhelper/test cppu
fpicker/test/makefile.mk| 23 --- solenv/inc/extension_pre.mk |2 +- xmlscript/test/makefile.mk | 20 3 files changed, 1 insertion(+), 44 deletions(-) New commits: commit 2a1171929e221ec689d2b8b6ac473d91b53b6286 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Mar 21 12:56:16 2012 +0200 chmod -x diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/chart2/prj/makefile.mk b/chart2/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/clucene/prj/makefile.mk b/clucene/prj/makefile.mk old mode 100755 new mode 100644 diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk old mode 100755 new mode 100644 diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk old mode 100755 new mode 100644 diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
[Libreoffice-commits] .: 4 commits - sw/inc sw/source writerfilter/source
sw/inc/bparr.hxx|8 --
sw/source/core/bastyp/bparr.cxx | 16 +
sw/source/core/docnode/ndcopy.cxx |2 -
sw/source/core/docnode/nodes.cxx| 34 ++--
sw/source/core/txtnode/ndtxt.cxx|6
writerfilter/source/dmapper/PropertyMap.cxx | 23 ++
6 files changed, 59 insertions(+), 30 deletions(-)
New commits:
commit a4788b254268aa2d61b14678301f22cdbd27d2e7
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:42:02 2012 +0100
Revert sw-outline-numbering-broken-fix.diff: outline numbering fix in
master docs
This reverts commit 9a11bd42af0db32fd06c84dd955ee563134665ce.
Removing attributes from the _source_ node in SwTxtNode::MakeCopy does
not make any sens at all, and the cited issue i#96092 was apparently
fixed independently in CWS sw31bf04 by the change to ndtxt.cxx in
1524aa18b9ddf7a4181e3f278155c48655084452.
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 2461505..4aabfba 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -266,7 +266,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex rIdx ) const
// kopiere Attribute/Text
if( !pCpyAttrNd-HasSwAttrSet() )
// wurde ein AttrSet fuer die Numerierung angelegt, so loesche diesen!
-pCpyAttrNd-ResetAllAttr();
+pTxtNd-ResetAllAttr();
// if Copy-Textnode unequal to Copy-Attrnode, then copy first
// the attributes into the new Node.
commit cc99bb9f383a65912d004e227a5b6a88b401bbba
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:37:46 2012 +0100
writerfilter: PropertyMap: speed this up a bit
Using XMultiPropertySet reduces the number of SwTxtNodes created for the
bugdoc from rhbz#789022 from ~5k to ~3k.
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 575730f..ee3ba7f 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -32,6 +32,7 @@
#include i18nutil/paper.hxx
#include rtl/oustringostreaminserter.hxx
#include com/sun/star/beans/PropertyValue.hpp
+#include com/sun/star/beans/XMultiPropertySet.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/container/XEnumeration.hpp
@@ -986,6 +987,28 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl rDM_Impl )
void SectionPropertyMap::_ApplyProperties( uno::Reference beans::XPropertySet
xStyle )
{
PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+uno::Referencebeans::XMultiPropertySet const xMultiSet(xStyle,
+uno::UNO_QUERY);
+if (xMultiSet.is())
+{ // FIXME why is this a STL container???
+uno::Sequencertl::OUString names(this-size());
+uno::Sequenceuno::Any values(this-size());
+PropertyMap::iterator it = this-begin();
+for (size_t i = 0; it != this-end(); ++it, ++i)
+{
+names[i] = rPropNameSupplier.GetName(it-first.eId);
+values[i] = it-second;
+}
+try
+{
+xMultiSet-setPropertyValues(names, values);
+}
+catch( const uno::Exception )
+{
+OSL_FAIL( Exception in PageStyle::setPropertyValue);
+}
+return;
+}
PropertyMap::iterator aMapIter = begin();
while( aMapIter != end())
{
commit 082906e1f4cf58fdfab1a4064e2b7955fcdaeb8a
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 10:25:45 2012 +0100
rhbz#789022: SwNodes: fix inconsistent outline check:
SwNodes::UpdateOutlineNode will add/remove the node from
SwNodes::pOutlineNds depending on IsOutline(), while various SwNodes
methods that move and delete nodes check GetAttrOutlineLevel() != 0,
which may be false even if IsOutline() is true.
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 518de82..ab12430 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -173,7 +173,7 @@ void SwNodes::ChgNode( SwNodeIndex rDelPos, sal_uLong nSz,
pTxtNode-RemoveFromList();
-if ( pTxtNode-GetAttrOutlineLevel() != 0 )//-end,zhaojianwei
+if (pTxtNode-IsOutline())
{
const SwNodePtr pSrch = (SwNodePtr)rNd;
pOutlineNds-Remove( pSrch );
@@ -188,8 +188,7 @@ void SwNodes::ChgNode( SwNodeIndex rDelPos, sal_uLong nSz,
rTxtNd.AddToList();
-if( bInsOutlineIdx
-0 != rTxtNd.GetAttrOutlineLevel() )//-end,zhaojianwei
+if (bInsOutlineIdx rTxtNd.IsOutline())
{
const SwNodePtr pSrch =
[Libreoffice-commits] .: Branch 'feature/tubes' - configure.in tubes/CppunitTest_tubes_test.mk tubes/inc tubes/Library_tubes.mk tubes/qa tubes/source
configure.in |2
tubes/CppunitTest_tubes_test.mk |4
tubes/Library_tubes.mk |1
tubes/inc/tubes/contact-list.hxx | 60 +
tubes/qa/test_manager.cxx| 56
tubes/source/contact-list.cxx| 169 +++
6 files changed, 291 insertions(+), 1 deletion(-)
New commits:
commit 3cd4a8e788d01e87a2e6dbc768b99668443b0839
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Wed Mar 21 11:13:04 2012 +
tubes: add API to find contacts with LibO tube support
diff --git a/configure.in b/configure.in
index af324fc..7fdabdb 100644
--- a/configure.in
+++ b/configure.in
@@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support])
if test $_os != WINNT -a $_os != Darwin -a $enable_telepathy =
yes; then
ENABLE_TELEPATHY=TRUE
AC_MSG_RESULT([yes])
-PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0
gobject-2.0 gthread-2.0 dbus-1 dbus-glib-1 )
+PKG_CHECK_MODULES( TELEPATHY, telepathy-glib = 0.16.4 glib-2.0
gobject-2.0 gthread-2.0 gio-2.0 dbus-1 dbus-glib-1 )
else
AC_MSG_RESULT([no])
fi
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index 32810f9..7b558d7 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -36,6 +36,10 @@ $(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
$(gb_STDLIBS) \
))
+$(eval $(call gb_CppunitTest_add_libs,tubes_test, \
+$$(TELEPATHY_LIBS) \
+))
+
$(eval $(call gb_CppunitTest_set_include,tubes_test,\
-I$(realpath $(SRCDIR)/tubes/inc) \
$$(TELEPATHY_CFLAGS) \
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index 2ab2616..48ef793 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_exception_objects,tubes,\
tubes/source/conference \
tubes/source/manager \
tubes/source/packet \
+ tubes/source/contact-list \
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
new file mode 100644
index 000..bf1e0f7
--- /dev/null
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_TUBES_CONTACT_LIST_HXX
+#define INCLUDED_TUBES_CONTACT_LIST_HXX
+
+#include utility
+#include vector
+
+#include telepathy-glib/telepathy-glib.h
+
+#include tubes/tubesdllapi.h
+
+typedef ::std::pair TpAccount *, TpContact * AccountContactPair;
+typedef ::std::vector AccountContactPair AccountContactPairV;
+
+class TUBES_DLLPUBLIC ContactList
+{
+public:
+ContactList();
+~ContactList();
+
+typedef void (*PrepareCallback)( GError *errorOr0, void *user_data );
+voidprepare( PrepareCallback callback, void *user_data
);
+
+AccountContactPairV getContacts();
+
+private:
+TpAccountManager* mpAccountManager;
+
+};
+
+#endif // INCLUDED_TUBES_CONTACT_LIST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 07dd264..f017a9c 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -28,6 +28,7 @@
#include sal/precppunit.hxx
+#include tubes/contact-list.hxx
#include tubes/manager.hxx
#include cppunit/TestAssert.h
@@ -45,6 +46,7 @@ public:
TestTeleTubes();
~TestTeleTubes();
+void testContactList();
void testSetupManager1();
void testSetupManager2();
void testConnect1();
@@ -60,8 +62,11 @@ public:
void testDestroyManager2();
void testFailAlways();
+GMainLoop* mpMainLoop;
+
// Order is significant.
CPPUNIT_TEST_SUITE( TestTeleTubes );
+CPPUNIT_TEST( testContactList );
CPPUNIT_TEST( testSetupManager1 );
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/filter/ww8/ww8par2.cxx | 89 ---
1 file changed, 37 insertions(+), 52 deletions(-)
New commits:
commit 2406745e4e78e0346b1b303870abd0a85e861405
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 21 12:30:05 2012 +0100
Further clean up of previous patch
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 84fcfc5..f73e424 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -95,8 +95,6 @@ public:
{}
};
-typedef WW8SelBoxInfo* WW8SelBoxInfoPtr;
-
typedef boost::ptr_vectorWW8SelBoxInfo WW8MergeGroups;
struct WW8TabBandDesc
@@ -223,9 +221,7 @@ class WW8TabDesc
void InsertCells( short nIns );
void AdjustNewBand();
-// durchsucht aMergeGroups, meldet Index der ersten, passenden Gruppe bzw.
-// -1 Details siehe bei der Implementierung
-bool FindMergeGroup(short nX1, short nWidth, bool bExact, short nMGrIdx);
+WW8SelBoxInfo* FindMergeGroup(short nX1, short nWidth, bool bExact);
// einzelne Box ggfs. in eine Merge-Gruppe aufnehmen
// (die Merge-Gruppen werden dann spaeter auf einen Schlag abgearbeitet)
@@ -2567,7 +2563,7 @@ void WW8TabDesc::MergeCells()
for( short j = 0; j pActBand-nRows; j++, nRow++ )
for( short i = 0; i pActBand-nWwCols; i++ )
{
-WW8SelBoxInfoPtr pActMGroup = 0;
+WW8SelBoxInfo* pActMGroup = 0;
//
// ggfs. eine neue Merge-Gruppe beginnen
//
@@ -2650,11 +2646,15 @@ void WW8TabDesc::MergeCells()
// 1. ggfs. alte Mergegruppe(n) schliessen, die
// den von unserer neuen Gruppe betroffenen
// X-Bereich ueberdecken
-short nMGrIdx;
-while ( FindMergeGroup( nX1, pActMGroup-nGroupWidth,
-false, nMGrIdx ) )
+for (;;)
{
-aMergeGroups[ nMGrIdx ].bGroupLocked = true;
+WW8SelBoxInfo* p = FindMergeGroup(
+nX1, pActMGroup-nGroupWidth, false );
+if (p == 0)
+{
+break;
+}
+p-bGroupLocked = true;
}
// 3. und in Gruppen-Array eintragen
@@ -2736,8 +2736,8 @@ void WW8TabDesc::FinishSwTable()
// bearbeite alle Merge-Gruppen nacheinander
for (
WW8MergeGroups::iterator groupIt = aMergeGroups.begin();
-groupIt aMergeGroups.end();
-groupIt++)
+groupIt != aMergeGroups.end();
+++groupIt)
{
sal_uInt16 nActBoxCount = groupIt-size();
@@ -2769,16 +2769,12 @@ void WW8TabDesc::FinishSwTable()
//bExact= Flag, ob Box in dieser Gruppe passen muss,
// oder diese nur zu tangieren braucht
//
-bool WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact,
-short nMGrIdx)
+WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
{
-nMGrIdx = -1;
if( !aMergeGroups.empty() )
{
// noch als gueltig angesehener Bereich in der Naehe der Grenzen
const short nToleranz = 4;
-// die aktuell untersuchte Gruppe
-
// Boxgrenzen
short nX2 = nX1 + nWidth;
// ungefaehre Gruppengrenzen
@@ -2801,7 +2797,7 @@ bool WW8TabDesc::FindMergeGroup(short nX1, short nWidth,
bool bExact,
//
if( ( nX1 nGrX1 ) ( nX2 nGrX2 ) )
{
-nMGrIdx = iGr; break;
+return rActGroup;
}
//
// hat die Box Bereiche mit der Gruppe gemeinsam?
@@ -2817,13 +2813,13 @@ bool WW8TabDesc::FindMergeGroup(short nX1, short
nWidth, bool bExact,
|| ( ( nX1 =nGrX1 )
( nX2 =nGrX2 ) ) )
{
-nMGrIdx = iGr; break;
+return rActGroup;
}
}
}
}
}
-return ( -1 nMGrIdx );
+return 0;
}
bool WW8TabDesc::IsValidCell(short nCol) const
@@ -3330,10 +3326,8 @@ SwTableBox* WW8TabDesc::UpdateTableMergeGroup(
WW8_TCell rCell,
else
{
// Gruppe finden
-short nMGrIdx;
-if( FindMergeGroup( pActBand-nCenter[ nCol ],
-pActBand-nWidth[ nCol ], true, nMGrIdx ) )
-pTheMergeGroup = aMergeGroups.at( nMGrIdx );
+pTheMergeGroup = FindMergeGroup(
+
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit baebdaa48e88949bf6aa92c478733518bede5c6e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 13:42:38 2012 +0100 Call inflateInit2 instead of inflateInit for the zip stream diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index e443313..1154e54 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -464,7 +464,7 @@ void ZipFile::GetUncompressedContent( strm.opaque = Z_NULL; strm.avail_in = 0; strm.next_in = Z_NULL; -ret = inflateInit(strm); +ret = inflateInit2(strm,-MAX_WBITS); if (ret != Z_OK) return; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/CppunitTest_filter_tga_test.mk filter/Module_filter.mk filter/qa filter/source
filter/CppunitTest_filter_tga_test.mk | 69 +++ filter/Module_filter.mk |1 filter/qa/cppunit/data/tga/indeterminate/.gitignore |1 filter/qa/cppunit/data/tga/pass/fdo14924-5.tga |binary filter/qa/cppunit/data/tga/pass/fdo14924-6.tga |binary filter/qa/cppunit/filters-tga-test.cxx | 89 filter/source/graphicfilter/itga/itga.cxx | 21 ++-- 7 files changed, 170 insertions(+), 11 deletions(-) New commits: commit a52f5254c703ec0618611b8abf5deea6bef0dcb4 Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 21 09:45:09 2012 + tga filter broken for quite a while diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk new file mode 100644 index 000..aba7214 --- /dev/null +++ b/filter/CppunitTest_filter_tga_test.mk @@ -0,0 +1,69 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara caol...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CppunitTest_CppunitTest,filter_tga_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,filter_tga_test, \ +filter/qa/cppunit/filters-tga-test \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,filter_tga_test, \ +itg \ + sal \ + test \ + tl \ + unotest \ + vcl \ +$(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,filter_tga_test,\ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_add_api,filter_tga_test,\ +udkapi \ +offapi \ +)) + +$(eval $(call gb_CppunitTest_uses_ure,filter_tga_test)) + +$(eval $(call gb_CppunitTest_add_type_rdbs,filter_tga_test,\ +types \ +)) + +$(eval $(call gb_CppunitTest_add_components,filter_tga_test,\ +configmgr/source/configmgr \ +)) + +$(eval $(call gb_CppunitTest_set_args,filter_tga_test,\ +--headless \ +--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ +-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index dc8842e..4f9773d 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -78,6 +78,7 @@ endif ifneq ($(OS),WNT) # TODO, see if it links and runs under windows $(eval $(call gb_Module_add_check_targets,filter,\ +CppunitTest_filter_tga_test \ CppunitTest_filter_tiff_test \ )) endif diff --git a/filter/qa/cppunit/data/tga/fail/.gitignore b/filter/qa/cppunit/data/tga/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/tga/indeterminate/.gitignore b/filter/qa/cppunit/data/tga/indeterminate/.gitignore new file mode 100644 index 000..583b009 --- /dev/null +++ b/filter/qa/cppunit/data/tga/indeterminate/.gitignore @@ -0,0 +1 @@ +*.wmf-* diff --git a/filter/qa/cppunit/data/tga/pass/.gitignore b/filter/qa/cppunit/data/tga/pass/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/tga/pass/fdo14924-5.tga b/filter/qa/cppunit/data/tga/pass/fdo14924-5.tga new file mode 100644 index 000..c3b38f3 Binary files /dev/null and b/filter/qa/cppunit/data/tga/pass/fdo14924-5.tga differ diff --git a/filter/qa/cppunit/data/tga/pass/fdo14924-6.tga b/filter/qa/cppunit/data/tga/pass/fdo14924-6.tga new file mode 100644 index 000..92b7200 Binary files /dev/null and b/filter/qa/cppunit/data/tga/pass/fdo14924-6.tga differ diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx new file mode 100644 index 000..3de9d53 --- /dev/null +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -0,0 +1,89 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the
[Libreoffice-commits] Changes to 'feature/cmclayout'
New branch 'feature/cmclayout' available with the following commits: commit addba98c79c793f33591774e374aad1449c6c7bc Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 21 11:26:30 2012 + retro-fit dialog child traversal with nextLogicalChildOfParent retro-fit the logic that search dialog's children for keyboard short cuts and default focus widgets etc commit 7b30cef65ca692f4081c821b2c45a206582083d6 Author: Caolán McNamara caol...@redhat.com Date: Sat Mar 10 22:45:03 2012 + skip over layout parents commit 194b34b88868f398e49ec4c52002e30f06c1c3df Author: Caolán McNamara caol...@redhat.com Date: Sat Mar 10 22:21:46 2012 + convert some more tabpages commit d70c20f48c40ddc2a3cae354176145690f0d1d15 Author: Caolán McNamara caol...@redhat.com Date: Sat Mar 10 22:04:29 2012 + convert SwCharURLPage commit ffd78bbce41b81dd074ec723b884a670248b46fb Author: Caolán McNamara caol...@redhat.com Date: Fri Mar 9 22:55:21 2012 + convert SvxCharPositionPage commit 5a882f2e638d9bdfdddc64ca2742f7aba7e22cc3 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 7 09:20:47 2012 + force all tabs to exist when layout enabled commit 4a83c33781e7e30218e99fc432de7b365f7c3702 Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 6 19:31:18 2012 + manual font effect tab conversion commit c9b4bb1a86fee18711416ffeb53b9f9208c729e7 Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 6 19:30:22 2012 + add a setGridAttach utility commit f9266966a6225831bac6c305bd6ecf0d8ef3e60c Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 6 15:14:51 2012 +0100 layout western-only dialog differently commit d28ce41ffee9e81f8c18a583cbf83ea6850686de Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 6 15:04:04 2012 +0100 we don't need to manually move controls anymore commit 0dd4c91341aa3f626aab2bef1ae00e148a785279 Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 6 14:57:38 2012 +0100 implement override [height|width]-request commit c43a22ef7ae5724ec54d39c8093589c12ba55b7a Author: Caolán McNamara caol...@redhat.com Date: Sat Feb 4 01:18:43 2012 +0100 better initial size string for pre-update commit acbe330540e87eaeb13b2cffcaa631527e3686cc Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 3 18:49:56 2012 +0100 only need result of GetScrollBarSize in else branch commit d7d1eeff2e871623f391c8e389c1846b117198e0 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 3 16:29:37 2012 +0100 better use of hasPendingLayout commit 31dce38c9b53c74a661663cb999ed71d588aead7 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 15:30:47 2012 + tweak timer to affect layout-ed dialogs only commit b75ec0e53ce43864e67178cfc49d00f8161eb414 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 13:35:35 2012 + drop spew commit 124ff0027d32e3b6e43b825dc14cf2b444279b2c Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 13:28:07 2012 + reduce flicker with another timer commit da892a4bbc4661ca24b9fdfa9a5e93b84a15b2af Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:54:46 2012 + don't vert stretch grid on resize, alloc it all to the preview commit 2f284d9c6b67360d6e3661d94fa9fd44861c585f Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:49:43 2012 + implement row/col grid spanning commit a8116f47e8ea89646b12c603db2800530bf1fd6b Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:20:25 2012 + use grids for layout commit 3e555a78523cff3ccbbf34cf3668fa6282ca3701 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:17:39 2012 + implement a basic optimal size for the preview window commit 314d35398cbbd377ce6cddf98f4f04fa690b739e Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:15:29 2012 + set sane-ish maximum dialog size todo, extract and refactor the duplicate holy product mangement values and reuse those based on screensize commit 8e52a556d989c22ed6bca9fe5e423f17923c9e22 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:14:03 2012 + make setting properties virtual in order to handle borderwindow i.e. need to put the properties onto the actual window that gets set as the child of a container commit f731ac9a22455ee0302dfcf6b3be555dbab8f0a1 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 1 10:12:42 2012 + add a grid container commit 43a26e4cbbec8c8b03d5c5c7d13aa705845c4b6e Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 1 12:01:48 2011 + make SfxTabDialog layout buttons with button-box commit f4447cd6aa5def2f8af8bbf997027b6968a73ed5 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 1 12:01:02 2011 + set char dialog resizable commit c25469ec7ccdf3402d3af6396976868313886e3d Author: Caolán
[Libreoffice-commits] Changes to 'feature/cmclayout'
New branch 'feature/cmclayout' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/inc/gtkprintwrapper.hxx |4 1 file changed, 4 insertions(+) New commits: commit 5c732ef6b566c35e18ed4f259764d5e8438d0527 Author: David Bolen db3l@gmail.com Date: Wed Mar 21 13:29:29 2012 + Compilation fix - GTK print dialog headers for GTK 2.14 diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx index ab97512..8457430 100644 --- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx +++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx @@ -35,7 +35,11 @@ #include gtk/gtk.h #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(2,14,0) #include gtk/gtkunixprint.h +#else +#include gtk/gtkpagesetupunixdialog.h +#endif #if !GTK_CHECK_VERSION(3,0,0) #include osl/module.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/atrfrm.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0994cb60411b0efc71a8d6ef182e158761a85b6b
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Mar 21 15:24:42 2012 +0100
SwFmtVertOrient: warn if passed relation type is wrong, don't just ignore it
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 920eb52..e836f62 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -149,7 +149,8 @@ sal_Int16 lcl_IntToRelation(const uno::Any rVal)
{
sal_Int16 eRet = text::RelOrientation::FRAME;
sal_Int16 nVal = 0;
-rVal = nVal;
+if (!(rVal = nVal))
+SAL_WARN(sw.core, lcl_IntToRelation: read from Any failed!);
switch(nVal)
{
case text::RelOrientation::PRINT_AREA: eRet =
text::RelOrientation::PRINT_AREA ; break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/inc tubes/source
tubes/inc/tubes/constants.h | 52 ++
tubes/source/contact-list.cxx | 12 -
2 files changed, 53 insertions(+), 11 deletions(-)
New commits:
commit 042c53a42cc0a94288370392b5697c5bb9abfb09
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Wed Mar 21 12:15:35 2012 +
Move tube service name definition to a header.
diff --git a/tubes/inc/tubes/constants.h b/tubes/inc/tubes/constants.h
new file mode 100644
index 000..6087115
--- /dev/null
+++ b/tubes/inc/tubes/constants.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_TUBES_CONSTANTS_H
+#define INCLUDED_TUBES_CONSTANTS_H
+
+/* DBusTube.ServiceName.
+ *
+ * FIXME: Should be something like
+ *
+ * org.libreoffice.calc
+ * org.libreoffice.writer
+ *
+ * etc. This does not need to include the org.freedesktop.Telepathy.Client
+ * stuff.
+ */
+#define LIBO_DTUBE_SERVICE \
+TP_CLIENT_BUS_NAME_BASE LibreOfficeTeleTest
+
+/* Client name suffix, for passing as 'name' to
+ * tp_simple_handler_new_with_am(). */
+#define LIBO_CLIENT_SUFFIX \
+LibreOffice
+
+#endif // INCLUDED_TUBES_CONSTANTS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index 7f707af..c342115 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -30,6 +30,7 @@
#include telepathy-glib/telepathy-glib.h
+#include tubes/constants.h
#include tubes/contact-list.hxx
ContactList::ContactList()
@@ -66,17 +67,6 @@ ContactList::~ContactList()
mpAccountManager = NULL;
}
-/* FIXME: Should be something like
- *
- * org.libreoffice.calc
- * org.libreoffice.writer
- *
- * etc. This does not need to include the org.freedesktop.Telepathy.Client
- * stuff.
- */
-#define LIBO_DTUBE_SERVICE \
-TP_CLIENT_BUS_NAME_BASE LibreOfficeTeleTest
-
static gboolean
contact_supports_libo_dtube (TpContact *contact)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/inc tubes/qa tubes/source
tubes/inc/tubes/manager.hxx | 57 +++--
tubes/qa/test_manager.cxx | 13 --
tubes/source/conference.cxx |5
tubes/source/manager.cxx| 277 +++-
4 files changed, 207 insertions(+), 145 deletions(-)
New commits:
commit f7a73875ede37d2690e6196456f3066735b66220
Author: Eike Rathke er...@redhat.com
Date: Wed Mar 21 16:10:16 2012 +0100
singleton impl
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 92fcc6b..decd548 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -44,6 +44,8 @@
typedef ::std::vectorTeleConferencePtr TeleConferenceVector;
+namespace osl { class Mutex; }
+class TeleManagerImpl;
/** Interface to Telepathy DBus Tubes.
@@ -68,19 +70,11 @@ public:
/** Prepare tube manager with account and service to be offered/listened
to.
-@param rAccount
-The account (JID) to use. This must be a valid JID that has been
-setup with Empathy or another Telepathy client providing
-Jabber/XMPP.
-
-@param rService
-WhatEver, is prepended with ...LibreOffice
-
@param bCreateOwnGMainLoop
Whether to create and iterate an own GMainLoop. For testing
purposes when no GMainLoop is available.
*/
-TeleManager( const rtl::OUString rAccount, const rtl::OUString rService,
bool bCreateOwnGMainLoop = false );
+TeleManager( bool bCreateOwnGMainLoop = false );
~TeleManager();
/** Prepare the Telepathy Account Manager.
@@ -91,11 +85,9 @@ public:
TODO: this needs some signalling mechanism
*/
voidprepareAccountManager();
-AccountManagerStatusgetAccountManagerStatus() const
-{
-return meAccountManagerStatus;
-}
+AccountManagerStatusgetAccountManagerStatus() const;
+#if 0
/** Start a group session in a MUC.
@param rConferenceRoom
@@ -109,13 +101,19 @@ public:
*/
boolstartGroupSession( const rtl::OUString
rConferenceRoom,
const rtl::OUString
rConferenceServer );
+#endif
/** Start a session with a buddy.
+@param rAccount
+The account (JID) to use. This must be a valid JID that has been
+setup with Empathy or another Telepathy client providing
+Jabber/XMPP.
+
@param rBuddy
-The buddy to be connected.
+The buddy to be connected. Must be a contact of rAccount.
*/
-boolstartBuddySession( const rtl::OUString rBuddy );
+boolstartBuddySession( const rtl::OUString rAccount,
const rtl::OUString rBuddy );
voidunregisterConference( TeleConferencePtr
pConference );
@@ -149,9 +147,9 @@ public:
rtl::OStringgetFullObjectPath() const;
/// Only for use with MainLoopFlusher
-GMainLoop* getMainLoop() const { return mpLoop; }
+GMainLoop* getMainLoop() const;
-GMainContext* getMainContext() const { return (mpLoop ?
g_main_loop_get_context( mpLoop) : NULL); }
+GMainContext* getMainContext() const;
static rtl::OString createUuid();
@@ -159,11 +157,11 @@ public:
// Only for callbacks.
voidsetChannelReadyHandlerInvoked( bool b ) {
mbChannelReadyHandlerInvoked = b; }
boolisChannelReadyHandlerInvoked() const { return
mbChannelReadyHandlerInvoked; }
-static void setAccountManagerReadyHandlerInvoked( bool b ) {
mbAccountManagerReadyHandlerInvoked = b; }
-static bool isAccountManagerReadyHandlerInvoked() { return
mbAccountManagerReadyHandlerInvoked; }
+voidsetAccountManagerReadyHandlerInvoked( bool b );
+boolisAccountManagerReadyHandlerInvoked() const;
/** Only the callback of prepareAccountManager() is to set this. */
-static void setAccountManagerReady( bool bPrepared);
+voidsetAccountManagerReady( bool bPrepared);
/** Iterate our GMainLoop, blocking, unconditionally. */
voiditerateLoop();
@@ -185,24 +183,19 @@ public:
private:
-rtl::OStringmaAccountID;
rtl::OStringmaService; // the WhatEver part
TeleConferenceVectormaConferences;
-GMainLoop* mpLoop;
-TpAccount* mpAccount;
-TpConnection* mpConnection;
-TpDBusDaemon* mpDBus;
-TpBaseClient* mpClient;
boolmbChannelReadyHandlerInvoked : 1;
-TpAccount* getMyAccount();
+TpAccount* getAccount( const rtl::OString rAccountID );
+
+static TeleManagerImpl* pImpl;
+static sal_uInt32 nRefCount;
+
+friend
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/formula.hxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 706ac4779de1870cf0d922f1cc3f6d4470392403
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 21 16:14:45 2012 +0100
Make sure one base class does not use another one after destruction
The original code lead to invoking a pure virtual function in Calc when
doing Ctrl-F2, ESC.
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 07b86ff..f8969c5 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -56,9 +56,12 @@ class SvLBoxEntry;
typedef ScTabViewShell* PtrTabViewShell;
//
-class ScFormulaDlg : public formula::FormulaDlg,
- public IAnyRefDialog,
- public formula::IFormulaEditorHelper
+// Order of base classes is important, as pointer to IFormulaEditorHelper base
+// is passed into constructor of FormulaDlg base, which expects the former to
+// outlive itself:
+class ScFormulaDlg : public formula::IFormulaEditorHelper,
+ public formula::FormulaDlg,
+ public IAnyRefDialog
{
ScFormulaReferenceHelper m_aHelper;
ScFormulaCell* pCell;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/type_reference
offapi/type_reference/typelibrary_history.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ba8a429a2e062879d1d6641e22838928da1d8573 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Mar 21 16:30:28 2012 +0100 Clarify example diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 963b555..0f7c616 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -1,4 +1,5 @@ -Example of updating an incompatibly-changed type in the accompanying types.rdb: +Example of updating an incompatibly-changed type (com.sun.star.script.Converter, +in this example) in the accompanying types.rdb: .../core mkdir tmp .../core LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/tubes2'
New branch 'feature/tubes2' available with the following commits: commit 0caa3fdb7280275dc4b43095ca75d22b35fd8178 Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 16:10:16 2012 +0100 singleton impl commit 2062a904cf34ec1f87226348f727c145aa3d5551 Author: Will Thompson will.thomp...@collabora.co.uk Date: Wed Mar 21 12:15:35 2012 + Move tube service name definition to a header. commit d6a4b60f991721c4ff2f8c2c5798ef616c0a3ddc Author: Will Thompson will.thomp...@collabora.co.uk Date: Wed Mar 21 11:13:04 2012 + tubes: add API to find contacts with LibO tube support commit 5142866e8c991c8a7462a97105e48905786ea2ef Author: Eike Rathke er...@redhat.com Date: Tue Mar 20 20:24:33 2012 +0100 restructure things to one account manager and one connection tubes are offered and accepted now, sending/receiving works YAY! Thanks to Will Thompson from Collabora. commit 0c2a5c4ad49eb1c6ab85e9f83e3c202d932b261b Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 20 12:22:05 2012 + virtualise the ScDocFunc to allow interposing some magic commit d8e065d7f06c5deea01991744eabc4404948a095 Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 20 11:58:54 2012 + Don't instantiate ScDocFunc objects, get them from the doc-shell commit dcb565fdc3ed8eb8d90bfeb51c2cd72470a7f1be Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 19 15:29:07 2012 + expand pkg_config flags for telepathy ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/vml/vmlformatting.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5881168bf8187149e2caf59e72e1ac2d739aa3a4 Author: Miklos Vajna vmik...@suse.cz Date: Wed Mar 21 16:39:15 2012 +0100 oox: it's EMU, not MEU diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 1197829..1d5a958 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -150,7 +150,7 @@ bool lclExtractDouble( double orfValue, sal_Int32 ornEndPos, const OUString r fValue *= 36.0; else if( (cChar1 == 'm') (cChar2 == 'm') ) // 1 mm = 36,000 EMU fValue *= 36000.0; -else if( (cChar1 == 'p') (cChar2 == 't') ) // 1 point = 1/72 inch = 12,700 MEU +else if( (cChar1 == 'p') (cChar2 == 't') ) // 1 point = 1/72 inch = 12,700 EMU fValue *= 12700.0; else if( (cChar1 == 'p') (cChar2 == 'c') ) // 1 pica = 1/6 inch = 152,400 EMU fValue *= 152400.0; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - Makefile sw/source unusedcode.easy
Makefile |1 +
sw/source/core/doc/doctxm.cxx | 19 +--
sw/source/core/inc/txmsrt.hxx |6 +++---
sw/source/core/tox/txmsrt.cxx |5 +
unusedcode.easy |7 +--
5 files changed, 15 insertions(+), 23 deletions(-)
New commits:
commit 034bc34ddc1bac817a6ef51bba19675551a461f4
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 15:25:27 2012 +
convert SwTOXSources to a std::vector
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index b1c9199..c8dd379 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1563,7 +1563,7 @@ String lcl_GetNumString( const SwTOXSortTabBase rBase,
sal_Bool bUsePrefix, sal
{
String sRet;
-if( !rBase.pTxtMark rBase.aTOXSources.Count() 0 )
+if( !rBase.pTxtMark !rBase.aTOXSources.empty() )
{ // only if it's not a Mark
const SwTxtNode* pNd = rBase.aTOXSources[0].pNd-GetTxtNode();
if( pNd )
@@ -1721,11 +1721,11 @@ void SwTOXBaseSection::GenerateText( sal_uInt16
nArrayIdx,
// Place holder for the PageNumber; we only respect the
first one
{
// The count of similiar entries gives the PagerNumber
pattern
-sal_uInt16 nSize = rBase.aTOXSources.Count();
-if( nSize 0 )
+size_t nSize = rBase.aTOXSources.size();
+if (nSize 0)
{
String aInsStr( cNumRepl );
-for(sal_uInt16 i=1; i nSize; ++i)
+for (size_t i = 1; i nSize; ++i)
{
aInsStr.AppendAscii( sPageDeli );
aInsStr += cNumRepl;
@@ -1740,7 +1740,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
{
// A bit tricky: Find a random Frame
const SwTOXSource* pTOXSource = 0;
-if(rBase.aTOXSources.Count())
+if (!rBase.aTOXSources.empty())
pTOXSource = rBase.aTOXSources[0];
// #i53420#
@@ -1906,9 +1906,8 @@ void SwTOXBaseSection::UpdatePageNum()
for(sal_uInt16 nRunInEntry = nCnt; nRunInEntry nCnt + nRange;
nRunInEntry++)
{
SwTOXSortTabBase* pSortBase = aSortArr[nRunInEntry];
-sal_uInt16 nSize = pSortBase-aTOXSources.Count();
-sal_uInt16 i;
-for( sal_uInt16 j = 0; j nSize; ++j )
+size_t nSize = pSortBase-aTOXSources.size();
+for (size_t j = 0; j nSize; ++j)
{
::SetProgressState( 0, pDoc-GetDocShell() );
@@ -1936,6 +1935,7 @@ void SwTOXBaseSection::UpdatePageNum()
}
// Insert as sorted
+sal_uInt16 i;
for( i = 0; i aNums.size() aNums[i] nPage; ++i )
;
@@ -2220,8 +2220,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase*
pNew)
return;
}
// If the own entry is already present, add it to the
references list
-pOld-aTOXSources.Insert( pNew-aTOXSources[0],
-pOld-aTOXSources.Count() );
+pOld-aTOXSources.push_back(pNew-aTOXSources[0]);
delete pNew;
return;
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 5b3e79d..e707741 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -58,13 +58,13 @@ struct SwTOXSource
xub_StrLen nPos;
sal_Bool bMainEntry;
-SwTOXSource() : pNd(0), nPos(0), bMainEntry(sal_False) {}
SwTOXSource( const SwCntntNode* pNode, xub_StrLen n, sal_Bool bMain )
: pNd(pNode), nPos(n), bMainEntry(bMain)
-{}
+{
+}
};
-SV_DECL_VARARR( SwTOXSources, SwTOXSource, 0 )
+typedef std::vectorSwTOXSource SwTOXSources;
class SwTOXInternational
{
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 13e51e8..e6f18c1 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -64,9 +64,6 @@ using ::rtl::OUString;
sal_uInt16 SwTOXSortTabBase::nOpt = 0;
-SV_IMPL_VARARR( SwTOXSources, SwTOXSource )
-
-
SwTOXInternational::SwTOXInternational( LanguageType nLang, sal_uInt16 nOpt,
const String rSortAlgorithm ) :
eLang( nLang ),
@@ -164,7 +161,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const
SwCntntNode* pNd,
n = *pTxtMark-GetStart();
SwTOXSource aTmp( pNd, n,
pTxtMark ? pTxtMark-GetTOXMark().IsMainEntry() :
sal_False );
-aTOXSources.Insert( aTmp, aTOXSources.Count() );
+aTOXSources.push_back(aTmp);
nPos =
[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - sc/source
sc/source/ui/docshell/docfunc.cxx | 12 -
sc/source/ui/docshell/docsh.cxx | 80 +-
sc/source/ui/inc/docfunc.hxx |4 +
sc/source/ui/inc/viewfunc.hxx |6 +-
sc/source/ui/view/cellsh3.cxx |2
sc/source/ui/view/viewfun4.cxx|8 ++-
sc/source/ui/view/viewfunc.cxx| 17 +++-
7 files changed, 109 insertions(+), 20 deletions(-)
New commits:
commit de709a5b0d0a0c774c9997fad98ce607103140a7
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 15:58:52 2012 +
dummy interception of ScFunc methods with INTERCEPT env var set.
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ab5dcd9..0485370 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2507,6 +2507,82 @@ sal_Bool ScDocShell::HasAutomaticTableName( const
String rFilter )
|| rFilter.EqualsAscii( pFilterRtf );
}
+namespace {
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual void EnterListAction( sal_uInt16 nNameResId )
+{
+// Want to group these operations for the other side ...
+String aUndo( ScGlobal::GetRscString( nNameResId ) );
+}
+virtual void EndListAction()
+{
+}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool PutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
+ sal_Bool bInterpret, sal_Bool bApi )
+{
+fprintf( stderr, put data\n );
+return ScDocFunc::PutData( rPos, rEngine, bInterpret, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos, const String rText,
+ sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
+ const String rFormulaNmsp,
+ const formula::FormulaGrammar::Grammar
eGrammar )
+{
+fprintf( stderr, set cell text '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetCellText( rPos, rText, bInterpret, bEnglish,
bApi, rFormulaNmsp, eGrammar );
+}
+
+virtual bool ShowNote( const ScAddress rPos, bool bShow = true )
+{
+fprintf( stderr, %s note\n, bShow ? show : hide );
+return ScDocFunc::ShowNote( rPos, bShow );
+}
+};
+
+static ScDocFunc *
+createDocFunc( ScDocShell *pThis )
+{
+if (getenv (INTERCEPT))
+return new ScDocFuncIntercept( *pThis );
+else
+return new ScDocFuncDirect( *pThis );
+}
+
+} // anonymous namespace
+
ScDocShell::ScDocShell( const ScDocShell rShell ) :
SvRefBase(),
SotObject(),
@@ -2538,7 +2614,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2661,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
commit 5d6ca544b4e9030be60f31583551b31c8d4c2f9a
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 15:57:35 2012 +
EnterData - remove un-necessary bRecord parameter for corner-case
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index e6be63c..9e72fac
[Libreoffice-commits] .: 3 commits - codemaker/README idlc/README javaunohelper/cppumaker sw/inc sw/source
codemaker/README |7 +--
idlc/README | 10 +-
javaunohelper/cppumaker/Makefile |2 +-
sw/inc/swtable.hxx|2 ++
sw/source/core/table/swtable.cxx |7 +++
sw/source/filter/ww8/WW8TableInfo.cxx |3 +--
6 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit 5c3dd5af41bc801ee6023513399c01c632dc7779
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 17:15:06 2012 +0100
fdo#45522: WW8TableInfo::processSwTable: check that table has layout
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e97de42..6473986 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -326,6 +326,8 @@ public:
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
+
+bool HasLayout() const;
};
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 3c0b4c1..c5f0d09 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2800,6 +2800,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt )
rFmt.Add( this );
}
+bool SwTable::HasLayout() const
+{
+const SwFrmFmt* pFrmFmt = GetFrmFmt();
+//a table in a clipboard document doesn't have any layout information
+return pFrmFmt SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt);
+}
+
void SwTableLine::RegisterToFormat( SwFmt rFmt )
{
rFmt.Add( this );
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 72993ba..7df6abc 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
WW8TableNodeInfo * pPrev = NULL;
-SwFrmFmt * pFrmFmt = pTable-GetFrmFmt();
-if (pFrmFmt != NULL pTable-IsTblComplex())
+if (pTable-IsTblComplex() pTable-HasLayout())
{
pPrev = processSwTableByLayout(pTable);
commit dfa1983b5dcce0d74db76ea08b5d6334a82320b4
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 15:11:53 2012 +0100
javaunohelper: missing dependecy on udkapi.rdb
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
index f0f3642..8ed1298 100644
--- a/javaunohelper/cppumaker/Makefile
+++ b/javaunohelper/cppumaker/Makefile
@@ -28,7 +28,7 @@
gb_PARTIALBUILD := T
include $(GBUILDDIR)/gbuild_simple.mk
-done : $(gb_UnoApiTarget_CPPUMAKERTARGET)
+done : $(gb_UnoApiTarget_CPPUMAKERTARGET) $(OUTDIR)/bin/udkapi.rdb
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
-Tcom.sun.star.beans.NamedValue \
commit 31fcce969deb8002307a1cd029867008a1c11ff0
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 21 14:26:18 2012 +0100
idlc/README: correct nonsense added in 534b3a9b2e
diff --git a/codemaker/README b/codemaker/README
index 96a08ac..3410b4b 100644
--- a/codemaker/README
+++ b/codemaker/README
@@ -1,2 +1,5 @@
-UNO interface declaration/stub generators for C++ (headers), Java (class
files), ... the one for .Net is in cli_ure.
-
+UNO interface declaration/stub generators for:
+- C++: cppumaker generates headers (.hpp and .hdl files) that provide
+ the UNO API C++ binding
+- Java: javamaker generates class files that provide the JVM UNO API binding
+- the one for .Net is in module cli_ure
diff --git a/idlc/README b/idlc/README
index 1b4c1f7..16eda1b 100644
--- a/idlc/README
+++ b/idlc/README
@@ -1,6 +1,6 @@
-Contains the C++ IDL compiler: idlcpp
+Contains the UNO IDL compiler, idlc, and preprocessor, idlcpp
+
+This compiler generates binary RDB fragments that can be assembled
+into a RDB (UNO type library) with the regmerge tool, as is done
+primarily in the offapi and udkapi directories.
-This compiler generates C++ headers - .hpp and .hdl files that provide
-the UNO C++ binding. That compilation is done primarily in the offapi
-and udkapi directories.
-2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/inc sw/source
sw/inc/swtable.hxx|2 ++
sw/source/core/table/swtable.cxx |7 +++
sw/source/filter/ww8/WW8TableInfo.cxx |3 +--
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ea92fb2b82a050c24a72c55a484163b07263ab4c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 17:15:06 2012 +0100
fdo#45522: WW8TableInfo::processSwTable: check that table has layout
(cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index fb1d253..73df08c 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -326,6 +326,8 @@ public:
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
+
+bool HasLayout() const;
};
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ae36c31..d961289 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2804,6 +2804,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt )
rFmt.Add( this );
}
+bool SwTable::HasLayout() const
+{
+const SwFrmFmt* pFrmFmt = GetFrmFmt();
+//a table in a clipboard document doesn't have any layout information
+return pFrmFmt SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt);
+}
+
void SwTableLine::RegisterToFormat( SwFmt rFmt )
{
rFmt.Add( this );
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 6171430..095c94b 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
WW8TableNodeInfo * pPrev = NULL;
-SwFrmFmt * pFrmFmt = pTable-GetFrmFmt();
-if (pFrmFmt != NULL pTable-IsTblComplex())
+if (pTable-IsTblComplex() pTable-HasLayout())
{
pPrev = processSwTableByLayout(pTable);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit e065cfc6746161f8ee43c9f32abc728987696043 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Mar 21 18:27:26 2012 +0100 checking for egrep doesn't necessarily set GREP as well diff --git a/configure.in b/configure.in index 0c5093e..66dcf18 100644 --- a/configure.in +++ b/configure.in @@ -62,6 +62,8 @@ fi AC_SUBST(CROSS_COMPILING) AC_PROG_EGREP +# AC_PROG_EGREP doesn't set GREP on all systems as well +AC_PATH_PROG(GREP, grep) if test $build_os = cygwin; then EXEEXT_FOR_BUILD=.exe ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/docshell/docfunc.cxx | 15 ++-
sc/source/ui/docshell/docsh.cxx |2
sc/source/ui/view/viewfunc.cxx| 152 +++---
3 files changed, 41 insertions(+), 128 deletions(-)
New commits:
commit 9570147a927e5db8e3944deb8cb1045d685f59ea
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 18:21:23 2012 +
re-direct EnterData and turn it into many smaller ops.
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 5cb7c18..294dd76 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -859,12 +859,19 @@ sal_Bool ScDocFunc::PutCell( const ScAddress rPos,
ScBaseCell* pNewCell, sal_Bo
pDoc-PutCell( rPos, pNewCell );
-// wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
-if (bUndo)
+if ( !bXMLLoading pNewCell-GetCellType() == CELLTYPE_FORMULA
!pDoc-GetAutoCalc() )
{
+ScFormulaCell *pFormCell = static_castScFormulaCell *( pNewCell );
+// calculate just the cell once and set Dirty again
+pFormCell-Interpret();
+pFormCell-SetDirtyVar();
+pDoc-PutInFormulaTree( pFormCell );
+}
+
+// wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
+if (bUndo)
rDocShell.GetUndoManager()-AddUndoAction(
new ScUndoPutCell( rDocShell, rPos, pUndoCell, pRedoCell,
bHeight ) );
-}
if (bHeight)
AdjustRowHeight( ScRange(rPos) );
@@ -1283,7 +1290,7 @@ sal_Bool ScDocFunc::ApplyAttributes( const ScMarkData
rMark, const ScPatternAtt
sal_Bool ScDocFunc::ApplyStyle( const ScMarkData rMark, const String
rStyleName,
-sal_Bool bRecord, sal_Bool bApi )
+sal_Bool bRecord, sal_Bool bApi )
{
ScDocument* pDoc = rDocShell.GetDocument();
if ( bRecord !pDoc-IsUndoEnabled() )
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0485370..e57c751 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2544,7 +2544,7 @@ public:
virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
{
-fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+fprintf( stderr, put cell '%p' type %d %d\n, pNewCell,
pNewCell-GetCellType(), bApi );
return ScDocFunc::PutCell( rPos, pNewCell, bApi );
}
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 28600b5..6277537 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -212,7 +212,7 @@ sal_Bool ScViewFunc::TestFormatArea( SCCOL nCol, SCROW
nRow, SCTAB nTab, sal_Boo
}
void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
-sal_Bool bAttrChanged, sal_Bool bAddUndo )
+ sal_Bool bAttrChanged, sal_Bool bAddUndo )
{
ScDocShell* pDocSh = GetViewData()-GetDocShell();
ScDocument* pDoc = pDocSh-GetDocument();
@@ -226,27 +226,18 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW
nRow, SCTAB nTab,
const ScPatternAttr* pDocOld = pDoc-GetPattern( nCol, nRow, nTab );
// pDocOld is only valid till call ApplyPattern!
-ScPatternAttr* pOldPattern = NULL;
-if ( bAddUndo )
-pOldPattern = new ScPatternAttr( *pDocOld );
-
const ScStyleSheet* pSrcStyle = pSource-GetStyleSheet();
-if ( pSrcStyle pSrcStyle != pDocOld-GetStyleSheet() )
-pDoc-ApplyStyle( nCol, nRow, nTab, *pSrcStyle );
-pDoc-ApplyPattern( nCol, nRow, nTab, *pSource );
-AdjustRowHeight( nRow, nRow, sal_True );//! nicht
doppelt ?
-if ( bAddUndo )
-{
-const ScPatternAttr* pNewPattern = pDoc-GetPattern( nCol, nRow,
nTab );
+// Ho hum ... - totally untested but looks fun ! :-)
+ScRange aRange( nCol, nRow, nTab, nCol, nRow, nTab );
+ScMarkData aMark;
+aMark.SetMarkArea( aRange );
-pDocSh-GetUndoManager()-AddUndoAction(
-new ScUndoCursorAttr( pDocSh, nCol, nRow, nTab,
- pOldPattern, pNewPattern,
pSource,
- sal_True ) );
+ScDocFunc rFunc = GetViewData()-GetDocFunc();
+if ( pSrcStyle pSrcStyle != pDocOld-GetStyleSheet() )
+rFunc.ApplyStyle( aMark, pSrcStyle-GetName(), sal_True, sal_False
);
-delete pOldPattern; // copied in undo (pool)
-}
+rFunc.ApplyAttributes( aMark, *pSource, sal_True, sal_False );
}
if ( bAttrChanged ) // value entered with
number format?
@@ -359,75 +350,21 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
{
ScDocument* pDoc = GetViewData()-GetDocument();
[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/inc tubes/qa tubes/source
tubes/inc/tubes/constants.h |6 ++
tubes/inc/tubes/manager.hxx | 28 +---
tubes/qa/test_manager.cxx |8 +++-
tubes/source/contact-list.cxx |3 ++-
tubes/source/manager.cxx | 35 +--
5 files changed, 53 insertions(+), 27 deletions(-)
New commits:
commit 92a829d601b66c327beb4dd52af5fc24d173523c
Author: Eike Rathke er...@redhat.com
Date: Wed Mar 21 19:31:50 2012 +0100
make service name configurable for tests
diff --git a/tubes/inc/tubes/constants.h b/tubes/inc/tubes/constants.h
index 6087115..447910e 100644
--- a/tubes/inc/tubes/constants.h
+++ b/tubes/inc/tubes/constants.h
@@ -39,13 +39,11 @@
* etc. This does not need to include the org.freedesktop.Telepathy.Client
* stuff.
*/
-#define LIBO_DTUBE_SERVICE \
-TP_CLIENT_BUS_NAME_BASE LibreOfficeTeleTest
+#define LIBO_DTUBE_SERVICE org.libreoffice.calc
/* Client name suffix, for passing as 'name' to
* tp_simple_handler_new_with_am(). */
-#define LIBO_CLIENT_SUFFIX \
-LibreOffice
+#define LIBO_CLIENT_SUFFIX LibreOffice
#endif // INCLUDED_TUBES_CONSTANTS_H
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 54a60a1..7f325c3 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -140,12 +140,6 @@ public:
*/
boolpopPacket( TelePacket rPacket );
-/// org.freedesktop.Telepathy.Client.LibreOfficeWhatEver
-rtl::OStringgetFullServiceName() const;
-
-/// /org/freedesktop/Telepathy/Client/LibreOfficeWhatEver
-rtl::OStringgetFullObjectPath() const;
-
/// Only for use with MainLoopFlusher
GMainLoop* getMainLoop() const;
@@ -181,9 +175,28 @@ public:
/** Iterate our GMainLoop, non-blocking, until nothing pending. */
voidflushLoop() const;
+/// LibreOfficeWhatEver
+static rtl::OString getFullClientName();
+
+/// org.libreoffice.calcWhatEver
+static rtl::OString getFullServiceName();
+
+/// /org/libreoffice/calcWhatEver
+static rtl::OString getFullObjectPath();
+
+/** Add a suffix to the client name and DBus tube names, e.g. WhatEver
+
+Normally the client name is LibreOffice and the DBus tube service name
+is something like org.libreoffice.calc, this modifies the names to
+LibreOffice+pName and org.libreoffice.calc+pName to make tests not
+interfere with the real world. This is not to be used otherwise. If
+used it must be called before the first TeleManager is instanciated
and
+connects.
+ */
+static void addSuffixToNames( const char* pName );
+
private:
-rtl::OStringmaService; // the WhatEver part
TeleConferenceVectormaConferences;
boolmbChannelReadyHandlerInvoked : 1;
@@ -192,6 +205,7 @@ private:
static TeleManagerImpl* pImpl;
static sal_uInt32 nRefCount;
+static rtl::OString aNameSuffix;
friend class TeleManagerImpl; // access to mutex
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 3618f6c..69266d0 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -46,11 +46,11 @@ public:
TestTeleTubes();
~TestTeleTubes();
-void testContactList();
void testSetupManager1();
void testSetupManager2();
void testConnect1();
void testConnect2();
+void testContactList();
void testPrepareAccountManager1();
void testPrepareAccountManager2();
void testStartBuddySession1();
@@ -66,11 +66,11 @@ public:
// Order is significant.
CPPUNIT_TEST_SUITE( TestTeleTubes );
-CPPUNIT_TEST( testContactList );
CPPUNIT_TEST( testSetupManager1 );
CPPUNIT_TEST( testSetupManager2 );
CPPUNIT_TEST( testConnect1 );
CPPUNIT_TEST( testConnect2 );
+CPPUNIT_TEST( testContactList );
CPPUNIT_TEST( testPrepareAccountManager1 );
CPPUNIT_TEST( testPrepareAccountManager2 );
CPPUNIT_TEST( testStartBuddySession1 );
@@ -83,9 +83,6 @@ public:
CPPUNIT_TEST( testFailAlways ); // need failure to display SAL_LOG,
comment out for real builds
CPPUNIT_TEST_SUITE_END();
-private:
-
-void runSetupManager( TeleManager* pManager, const rtl::OUString rBuddy );
};
// static, not members, so they actually survive cppunit test iteration
@@ -101,6 +98,7 @@ static sal_uInt32 nSentPackets = 0;
TestTeleTubes::TestTeleTubes()
{
+TeleManager::addSuffixToNames( TeleTest);
}
TestTeleTubes::~TestTeleTubes()
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index c342115..602bb63 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -32,6 +32,7 @@
#include tubes/constants.h
#include tubes/contact-list.hxx
+#include tubes/manager.hxx
ContactList::ContactList()
{
@@ -76,7 +77,7 @@
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - tubes/inc tubes/qa tubes/source
tubes/inc/tubes/constants.h |6 ++ tubes/inc/tubes/manager.hxx | 30 ++ tubes/qa/test_manager.cxx |8 +++- tubes/source/contact-list.cxx |3 ++- tubes/source/manager.cxx | 37 ++--- 5 files changed, 55 insertions(+), 29 deletions(-) New commits: commit 786b18fe7e6038797fcb4812add78e4888913f5b Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 16:41:34 2012 +0100 removed trailing whitespace diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 6376ca0..7f325c3 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -125,7 +125,7 @@ public: voidacceptTube( TpChannel* pChannel, const char* pAddress ); /** Send data to all registered conferences. - + @returns to how many conferences the packet was send */ sal_uInt32 sendPacket( const TelePacket rPacket ) const; diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 1ce78dd..796e986 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -742,7 +742,7 @@ rtl::OString TeleManager::createUuid() } aBuf[32] = 0; return rtl::OString( aBuf); -} +} // static commit 8536137020fa3ab9b48e12de2e0dc5c65808186a Author: Eike Rathke er...@redhat.com Date: Wed Mar 21 19:31:50 2012 +0100 make service name configurable for tests diff --git a/tubes/inc/tubes/constants.h b/tubes/inc/tubes/constants.h index 6087115..447910e 100644 --- a/tubes/inc/tubes/constants.h +++ b/tubes/inc/tubes/constants.h @@ -39,13 +39,11 @@ * etc. This does not need to include the org.freedesktop.Telepathy.Client * stuff. */ -#define LIBO_DTUBE_SERVICE \ -TP_CLIENT_BUS_NAME_BASE LibreOfficeTeleTest +#define LIBO_DTUBE_SERVICE org.libreoffice.calc /* Client name suffix, for passing as 'name' to * tp_simple_handler_new_with_am(). */ -#define LIBO_CLIENT_SUFFIX \ -LibreOffice +#define LIBO_CLIENT_SUFFIX LibreOffice #endif // INCLUDED_TUBES_CONSTANTS_H diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index decd548..6376ca0 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -140,12 +140,6 @@ public: */ boolpopPacket( TelePacket rPacket ); -/// org.freedesktop.Telepathy.Client.LibreOfficeWhatEver -rtl::OStringgetFullServiceName() const; - -/// /org/freedesktop/Telepathy/Client/LibreOfficeWhatEver -rtl::OStringgetFullObjectPath() const; - /// Only for use with MainLoopFlusher GMainLoop* getMainLoop() const; @@ -181,9 +175,28 @@ public: /** Iterate our GMainLoop, non-blocking, until nothing pending. */ voidflushLoop() const; +/// LibreOfficeWhatEver +static rtl::OString getFullClientName(); + +/// org.libreoffice.calcWhatEver +static rtl::OString getFullServiceName(); + +/// /org/libreoffice/calcWhatEver +static rtl::OString getFullObjectPath(); + +/** Add a suffix to the client name and DBus tube names, e.g. WhatEver + +Normally the client name is LibreOffice and the DBus tube service name +is something like org.libreoffice.calc, this modifies the names to +LibreOffice+pName and org.libreoffice.calc+pName to make tests not +interfere with the real world. This is not to be used otherwise. If +used it must be called before the first TeleManager is instanciated and +connects. + */ +static void addSuffixToNames( const char* pName ); + private: -rtl::OStringmaService; // the WhatEver part TeleConferenceVectormaConferences; boolmbChannelReadyHandlerInvoked : 1; @@ -192,6 +205,7 @@ private: static TeleManagerImpl* pImpl; static sal_uInt32 nRefCount; +static rtl::OString aNameSuffix; friend class TeleManagerImpl; // access to mutex diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index 3618f6c..69266d0 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -46,11 +46,11 @@ public: TestTeleTubes(); ~TestTeleTubes(); -void testContactList(); void testSetupManager1(); void testSetupManager2(); void testConnect1(); void testConnect2(); +void testContactList(); void testPrepareAccountManager1(); void testPrepareAccountManager2(); void testStartBuddySession1(); @@ -66,11 +66,11 @@ public: // Order is significant. CPPUNIT_TEST_SUITE( TestTeleTubes ); -CPPUNIT_TEST( testContactList ); CPPUNIT_TEST( testSetupManager1 ); CPPUNIT_TEST( testSetupManager2 ); CPPUNIT_TEST( testConnect1 ); CPPUNIT_TEST( testConnect2 ); +CPPUNIT_TEST( testContactList ); CPPUNIT_TEST( testPrepareAccountManager1 );
[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - Repository.mk tubes/Executable_liboapprover.mk tubes/LibreOfficeApprover.client tubes/LibreOffice.client tubes/Module_tubes.mk tubes/org.
Repository.mk |1
tubes/Executable_liboapprover.mk | 47 +
tubes/LibreOffice.client | 11
tubes/LibreOfficeApprover.client |8
tubes/Module_tubes.mk |1
tubes/README | 17
tubes/org.freedesktop.Telepathy.Client.LibreOffice.service |3
tubes/org.freedesktop.Telepathy.Client.LibreOfficeApprover.service |3
tubes/source/approver.c| 246
++
9 files changed, 337 insertions(+)
New commits:
commit 6db31dc4ba6e296d05629c12494007cc80adb019
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Wed Mar 21 18:51:24 2012 +
tubes approver: add error handling in case spawning LibO fails
diff --git a/tubes/source/approver.c b/tubes/source/approver.c
index fdf0799..5f4bbde 100644
--- a/tubes/source/approver.c
+++ b/tubes/source/approver.c
@@ -45,16 +45,21 @@ handle_with_cb (GObject *source,
gpointer user_data)
{
TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
- GError *error;
+ GtkDialog *dialog = GTK_DIALOG (user_data);
+ GError *error = NULL;
if (!tp_channel_dispatch_operation_handle_with_finish (cdo, result, error))
{
g_print (HandleWith() failed: %s\n, error-message);
+ gtk_message_dialog_format_secondary_markup (dialog,
+ bError/b\n\nAsking LibreOffice to accept the session failed:
i%s/i,
+ error-message);
g_error_free (error);
return;
}
g_print (HandleWith() succeeded\n);
+ gtk_widget_destroy (dialog);
}
static void
@@ -64,7 +69,7 @@ close_cb (GObject *source,
{
TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
- GError *error;
+ GError *error = NULL;
if (!tp_channel_dispatch_operation_close_channels_finish (cdo, result,
error))
{
@@ -90,16 +95,19 @@ dialog_response_cb (
g_print (Approve channels\n);
tp_channel_dispatch_operation_handle_with_async (cdo, NULL,
-handle_with_cb, NULL);
+handle_with_cb, dialog);
+
+gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT, FALSE);
+gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_REJECT, FALSE);
}
else
{
g_print (Reject channels\n);
-tp_channel_dispatch_operation_close_channels_async (cdo, close_cb,
NULL);
+tp_channel_dispatch_operation_close_channels_async (cdo, close_cb,
dialog);
+gtk_widget_destroy (dialog);
}
-gtk_widget_destroy (dialog);
g_object_unref (cdo);
}
commit 44a4ec0ae0554cbbf1a07a1aecaa62624155527b
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Wed Mar 21 18:38:27 2012 +
Add WIP .client and .service files.
These are roughly what need to get installed to make the approver (the
little dialog box that pops up for incoming offers) and handler
(LibreOffice itself) service-activatable.
Without these, your contacts will only see that you're capable of
LibreOffice tubes while you're running LibreOffice, and you won't get
a prompt unless liboapprover is running.
diff --git a/tubes/LibreOffice.client b/tubes/LibreOffice.client
new file mode 100644
index 000..8c3356f
--- /dev/null
+++ b/tubes/LibreOffice.client
@@ -0,0 +1,11 @@
+[org.freedesktop.Telepathy.Client]
+Interfaces = org.freedesktop.Telepathy.Client.Handler;
+
+[org.freedesktop.Telepathy.Client.Handler]
+BypassApproval = false
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
+org.freedesktop.Telepathy.Channel.TargetHandleType u = 1
+org.freedesktop.Telepathy.Channel.ChannelType s =
org.freedesktop.Telepathy.Channel.Type.DBusTube
+org.freedesktop.Telepathy.Channel.Type.DBusTube.ServiceName s =
org.libreoffice.calc
+
diff --git a/tubes/LibreOfficeApprover.client b/tubes/LibreOfficeApprover.client
new file mode 100644
index 000..035e022
--- /dev/null
+++ b/tubes/LibreOfficeApprover.client
@@ -0,0 +1,8 @@
+[org.freedesktop.Telepathy.Client]
+Interfaces = org.freedesktop.Telepathy.Client.Approver;
+
+[org.freedesktop.Telepathy.Client.Approver.ApproverChannelFilter 0]
+org.freedesktop.Telepathy.Channel.TargetHandleType u = 1
+org.freedesktop.Telepathy.Channel.ChannelType s =
org.freedesktop.Telepathy.Channel.Type.DBusTube
+org.freedesktop.Telepathy.Channel.Type.DBusTube.ServiceName s =
org.libreoffice.calc
+
diff --git a/tubes/README b/tubes/README
index 3527a72..84d4892 100644
--- a/tubes/README
+++ b/tubes/README
@@ -8,6 +8,23 @@ the same TeleConference abstraction.
To enable configure LibO with --enable-telepathy
+If you have a Telepathy-enabled LibreOffice installed to /usr (including
+liboapprover) you may also want to install the .service and .client files
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/source/ui/collab/sendfunc.cxx | 134 +++
sc/source/ui/docshell/docsh.cxx | 80 ---
sc/source/ui/inc/docsh.hxx |2
4 files changed, 139 insertions(+), 78 deletions(-)
New commits:
commit 7cd15beb86a11bc5721436b8441cc4cff7e50ef5
Author: Michael Meeks michael.me...@suse.com
Date: Wed Mar 21 19:06:35 2012 +
split ScDocFunc interceptor to new collab/ module and start on it
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 3856a08..a3554ce 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -313,6 +313,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/cctrl/popmenu \
sc/source/ui/cctrl/tbinsert \
sc/source/ui/cctrl/tbzoomsliderctrl \
+ sc/source/ui/collab/sendfunc \
sc/source/ui/dbgui/asciiopt \
sc/source/ui/dbgui/consdlg \
sc/source/ui/dbgui/csvcontrol \
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
new file mode 100644
index 000..ccc785d
--- /dev/null
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Michael Meeks michael.me...@suse.com (initial
developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include sal/config.h
+#include cell.hxx
+#include docsh.hxx
+#include docfunc.hxx
+
+namespace {
+
+// Ye noddy protocol !
+// method name ',' then arguments comma separated
+class ScChangeOp
+{
+ rtl::OUStringBuffer aMessage;
+public:
+ ScChangeOp( const char *pName )
+ {
+aMessage.appendAscii( pName );
+aMessage.append( sal_Unicode( ',' ) );
+ }
+
+ void appendString( const ScAddress rPos )
+ {
+rtl::OUString aStr;
+rPos.Format( aStr );
+aMessage.append( aStr );
+ }
+
+ void appendAddress( const ScAddress rPos )
+ {
+(void)rPos;
+ }
+};
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual void EnterListAction( sal_uInt16 nNameResId )
+{
+// Want to group these operations for the other side ...
+String aUndo( ScGlobal::GetRscString( nNameResId ) );
+}
+virtual void EndListAction()
+{
+}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell '%p' type %d %d\n, pNewCell,
pNewCell-GetCellType(), bApi );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool PutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
+ sal_Bool bInterpret, sal_Bool bApi )
+{
+fprintf( stderr, put data\n );
+return ScDocFunc::PutData( rPos, rEngine, bInterpret, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos,
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4762788eb4ab7f2278861aaf9b9d6d665db61310 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Mar 21 20:20:49 2012 +0100 AC_PROG_GREP (I'm pedantic, am I not?) diff --git a/configure.in b/configure.in index 66dcf18..08cd362 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,7 @@ AC_SUBST(CROSS_COMPILING) AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well -AC_PATH_PROG(GREP, grep) +AC_PROG_GREP if test $build_os = cygwin; then EXEEXT_FOR_BUILD=.exe ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: formula/inc formula/Library_forui.mk formula/Package_inc.mk formula/source
formula/Library_forui.mk|1
formula/Package_inc.mk |1
formula/inc/formula/formula.hxx |9 -
formula/inc/formula/omoduleclient.hxx | 52
formula/source/ui/dlg/formula.cxx |1
formula/source/ui/dlg/funcpage.hxx |2 -
formula/source/ui/dlg/omoduleclient.cxx | 43 ++
formula/source/ui/dlg/parawin.hxx |2 -
formula/source/ui/dlg/structpg.hxx |2 -
formula/source/ui/inc/ModuleHelper.hxx | 13
10 files changed, 109 insertions(+), 17 deletions(-)
New commits:
commit bc99f1ce4c70aa9f29bcb5b7c7f18f96f44f111c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 21 20:32:16 2012 +0100
Ensure ResMgr outlives Resources
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 660057a..1a42689 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_Library_add_exception_objects,forui,\
formula/source/ui/dlg/FormulaHelper \
formula/source/ui/dlg/funcpage \
formula/source/ui/dlg/funcutl \
+formula/source/ui/dlg/omoduleclient \
formula/source/ui/dlg/parawin \
formula/source/ui/dlg/structpg \
formula/source/ui/resource/ModuleHelper \
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
index 5cb8434..b9aeaa7 100644
--- a/formula/Package_inc.mk
+++ b/formula/Package_inc.mk
@@ -40,6 +40,7 @@ $(eval $(call
gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,funcutl.hx
$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,grammar.hxx))
$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,IControlReferenceHandler.hxx))
$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,IFunctionDescription.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/omoduleclient.hxx,omoduleclient.hxx))
$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,opcode.hxx))
$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,tokenarray.hxx))
$(eval $(call gb_Package_add_file,formula_inc,inc/formula/token.hxx,token.hxx))
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 17f8fb4..ac9023d 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -32,6 +32,7 @@
#include sfx2/basedlgs.hxx
#include memory
#include formula/formuladllapi.h
+#include formula/omoduleclient.hxx
namespace formula
{
@@ -87,7 +88,13 @@ protected:
voidUpdate(const String _sExp);
};
-class FORMULA_DLLPUBLIC FormulaDlg : public SfxModelessDialog
+class FORMULA_DLLPUBLIC FormulaDlg:
+private OModuleClient, public SfxModelessDialog
+// order of base classes is important, as OModuleClient controls the
+// lifecycle of the ResMgr passed into SfxModelessDialog (via
+// formula::ModuleRes), and at least with DBG_UTIL calling TestRes in
+// ~Resource, the ResMgr must outlive the Resource (from which
+// SfxModelessDialog ultimately derives)
{
friend class FormulaDlg_Impl;
public:
diff --git a/formula/inc/formula/omoduleclient.hxx
b/formula/inc/formula/omoduleclient.hxx
new file mode 100644
index 000..23f63c2
--- /dev/null
+++ b/formula/inc/formula/omoduleclient.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#ifndef INCLUDED_FORMULA_MODULECLIENT_HXX
+#define INCLUDED_FORMULA_MODULECLIENT_HXX
+
+#include sal/config.h
+
+#include boost/noncopyable.hpp
+#include formula/formuladllapi.h
+
+namespace formula {
+
+/** Base class for objects which use any global module-specific ressources.
+*/
+class FORMULA_DLLPUBLIC
[Libreoffice-commits] .: formula/source
formula/source/ui/inc/ModuleHelper.hxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 543697d1d6da48ef7a6b690159c33ea6d07b72b3
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Mar 21 20:41:13 2012 +0100
No FORMULA_DLLPUBLIC needed here
diff --git a/formula/source/ui/inc/ModuleHelper.hxx
b/formula/source/ui/inc/ModuleHelper.hxx
index 6f10876..6599c38 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -31,7 +31,6 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include tools/resmgr.hxx
-#include formula/formuladllapi.h
//.
namespace formula
{
@@ -41,7 +40,7 @@ namespace formula
//=
class OModuleClient;
class OModuleImpl;
-class FORMULA_DLLPUBLIC OModule
+class OModule
{
friend class OModuleClient;
@@ -75,7 +74,7 @@ namespace formula
//=
/** specialized ResId, using the ressource manager provided by the global
module
*/
-class FORMULA_DLLPUBLIC ModuleRes : public ::ResId
+class ModuleRes : public ::ResId
{
public:
ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 170 ---
1 file changed, 135 insertions(+), 35 deletions(-)
New commits:
commit 70ce9efbac248f0e7952cda6cfb783798b62d459
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Mar 21 15:41:14 2012 -0400
New unit test for pivot table with duplicated data fields.
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 43ea584..2f8d099 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -153,6 +153,12 @@ public:
*/
void testPivotTableCache();
+/**
+ * Test for pivot table containing data fields that reference the same
+ * source field but different functions.
+ */
+void testPivotTableDuplicateDataFields();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -208,6 +214,7 @@ public:
CPPUNIT_TEST(testPivotTableFilters);
CPPUNIT_TEST(testPivotTableNamedSource);
CPPUNIT_TEST(testPivotTableCache);
+CPPUNIT_TEST(testPivotTableDuplicateDataFields);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -1104,6 +,12 @@ struct DPFieldDef
{
const char* pName;
sheet::DataPilotFieldOrientation eOrient;
+
+/**
+ * Function for data field. It's used only for data field. When 0, the
+ * default function (SUM) is used.
+ */
+int eFunc;
};
templatesize_t _Size
@@ -1214,7 +1227,6 @@ ScDPObject* createDPFromSourceDesc(
// Check the sanity of the source range.
const ScRange rSrcRange = rDesc.GetSourceRange();
-SCCOL nCol1 = rSrcRange.aStart.Col();
SCROW nRow1 = rSrcRange.aStart.Row();
SCROW nRow2 = rSrcRange.aEnd.Row();
CPPUNIT_ASSERT_MESSAGE(source range contains no data!, nRow2 - nRow1
1);
@@ -1222,15 +1234,19 @@ ScDPObject* createDPFromSourceDesc(
// Set the dimension information.
for (size_t i = 0; i nFieldCount; ++i)
{
-OUString aDimName = pDoc-GetString(nCol1+i, nRow1,
rSrcRange.aStart.Tab());
-ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName);
+OUString aDimName = rtl::OUString::createFromAscii(aFields[i].pName);
+ScDPSaveDimension* pDim = aSaveData.GetNewDimensionByName(aDimName);
pDim-SetOrientation(static_castsal_uInt16(aFields[i].eOrient));
pDim-SetUsedHierarchy(0);
pDim-SetShowEmpty(true);
if (aFields[i].eOrient == sheet::DataPilotFieldOrientation_DATA)
{
-pDim-SetFunction(sheet::GeneralFunction_SUM);
+sheet::GeneralFunction eFunc = sheet::GeneralFunction_SUM;
+if (aFields[i].eFunc)
+eFunc = static_castsheet::GeneralFunction(aFields[i].eFunc);
+
+pDim-SetFunction(eFunc);
pDim-SetReferenceValue(NULL);
}
else
@@ -1249,20 +1265,6 @@ ScDPObject* createDPFromSourceDesc(
aShowInfo.ShowItemsMode = 0;
aShowInfo.ItemCount = 0;
pDim-SetAutoShowInfo(aShowInfo);
-
-// USHORT nFuncs[] = { sheet::GeneralFunction_AUTO };
-// pDim-SetSubTotals(1, nFuncs);
-}
-
-for (SCROW nRow = nRow1 + 1; nRow = nRow2; ++nRow)
-{
-SCCOL nCol = nCol1 + static_castSCCOL(i);
-rtl::OUString aVal;
-pDoc-GetString(nCol, nRow, 0, aVal);
-// This call is just to populate the member list for each
dimension.
-ScDPSaveMember* pMem = pDim-GetMemberByName(aVal);
-pMem-SetShowDetails(true);
-pMem-SetIsVisible(true);
}
}
@@ -1312,9 +1314,9 @@ void Test::testPivotTable()
// Dimension definition
DPFieldDef aFields[] = {
-{ Name, sheet::DataPilotFieldOrientation_ROW },
-{ Group, sheet::DataPilotFieldOrientation_COLUMN },
-{ Score, sheet::DataPilotFieldOrientation_DATA }
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Group, sheet::DataPilotFieldOrientation_COLUMN, 0 },
+{ Score, sheet::DataPilotFieldOrientation_DATA, 0 }
};
// Raw data
@@ -1496,9 +1498,9 @@ void Test::testPivotTableLabels()
// Dimension definition
DPFieldDef aFields[] = {
-{ Software, sheet::DataPilotFieldOrientation_ROW },
-{ Version, sheet::DataPilotFieldOrientation_COLUMN },
-{ 1.2.3,sheet::DataPilotFieldOrientation_DATA }
+{ Software, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Version, sheet::DataPilotFieldOrientation_COLUMN, 0 },
+{ 1.2.3,sheet::DataPilotFieldOrientation_DATA, 0 }
};
// Raw data
@@ -1558,9 +1560,9 @@ void Test::testPivotTableDateLabels()
// Dimension definition
DPFieldDef aFields[] = {
-{ Name, sheet::DataPilotFieldOrientation_ROW },
-{ Date, sheet::DataPilotFieldOrientation_COLUMN },
-{ Value, sheet::DataPilotFieldOrientation_DATA }
+{ Name,
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 7d4293b3ba64ffd51731d9a2d478a88a45836aa2 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Mar 21 16:28:44 2012 -0400 Make sure that FillLabelData doesn't crash in presence of duplicated dims. diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 2f8d099..c134f13 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2134,6 +2134,11 @@ void Test::testPivotTableDuplicateDataFields() CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess); } +ScPivotParam aParam; +pDPObj-FillLabelData(aParam); +CPPUNIT_ASSERT_MESSAGE(There should be exactly 4 labels (2 original, 1 data layout, and 1 duplicate dimensions)., + aParam.maLabelArray.size() == 4); + pDPs-FreeTable(pDPObj); m_pDoc-DeleteTab(1); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit d6e96d0a4e03bb722b9aa62ccd26b25c64c07a45 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Mar 21 21:45:06 2012 +0100 add missing AC_MSG_RESULT() else branch diff --git a/configure.in b/configure.in index 08cd362..c6df5f1 100644 --- a/configure.in +++ b/configure.in @@ -7686,6 +7686,8 @@ if test $WANT_X11 = yes -a $test_xrender = yes; then else AC_MSG_RESULT([internal]) fi +else +AC_MSG_RESULT([no]) fi dnl === ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: shell/source
shell/source/win32/zipfile/zipfile.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f729d2d83034167db9727c2de2f4e5a32a7374d8 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Mar 21 22:42:43 2012 +0100 Appease valgrind diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index 1154e54..452c17a 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -487,6 +487,7 @@ void ZipFile::GetUncompressedContent( ContentBuffer.clear(); return; } + (void)inflateEnd(strm); } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - formula/inc formula/source reportdesign/source sc/source sfx2/source
formula/inc/formula/formula.hxx| 13 ++
formula/source/ui/dlg/formula.cxx | 42 ++---
reportdesign/source/ui/dlg/Formula.cxx |4 ++-
reportdesign/source/ui/inc/Formula.hxx |2 -
sc/source/ui/formdlg/formula.cxx |3 +-
sc/source/ui/inc/formula.hxx |7 -
sfx2/source/appl/childwin.cxx |6 +---
7 files changed, 45 insertions(+), 32 deletions(-)
New commits:
commit 278c53c9bed24a74c4c1931e725b64deef02
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Mar 21 21:44:01 2012 +0100
restructure the code a bit more
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 55cc0bc..7a16b3d 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -33,6 +33,7 @@
#include memory
#include formula/formuladllapi.h
#include formula/omoduleclient.hxx
+#include formula/IFunctionDescription.hxx
namespace formula
{
@@ -48,7 +49,6 @@ enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA,
FORMULA_FORMDLG_ARGS, FORMULA_FOR
//
-class IFormulaEditorHelper;
class FormulaDlg_Impl;
class IControlReferenceHandler;
class IFunctionDescription;
@@ -58,7 +58,7 @@ class RefEdit;
class RefButton;
class FormEditData;
//
-class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog
+class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog, public
formula::IFormulaEditorHelper
{
friend class FormulaDlg_Impl;
public:
@@ -66,7 +66,6 @@ public:
, bool _bSupportFunctionResult
, bool _bSupportResult
, bool _bSupportMatrix
-,IFormulaEditorHelper* _pHelper
,IFunctionManager* _pFunctionMgr
,IControlReferenceHandler* _pDlg =
NULL );
virtual ~FormulaModalDialog();
@@ -92,7 +91,7 @@ protected:
};
class FORMULA_DLLPUBLIC FormulaDlg:
-private OModuleClient, public SfxModelessDialog
+private OModuleClient, public SfxModelessDialog, public
IFormulaEditorHelper
// order of base classes is important, as OModuleClient controls the
// lifecycle of the ResMgr passed into SfxModelessDialog (via
// formula::ModuleRes), and at least with DBG_UTIL calling TestRes in
@@ -107,7 +106,6 @@ public:
, bool _bSupportFunctionResult
, bool _bSupportResult
, bool _bSupportMatrix
-, IFormulaEditorHelper* _pHelper
, IFunctionManager* _pFunctionMgr
, IControlReferenceHandler* _pDlg = NULL );
virtual ~FormulaDlg();
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 70eccb3..ac0cac6 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1657,14 +1657,13 @@ FormulaModalDialog::FormulaModalDialog( Window* pParent
, bool _bSupportFunctionResult
, bool _bSupportResult
, bool _bSupportMatrix
-, IFormulaEditorHelper* _pHelper
, IFunctionManager* _pFunctionMgr
, IControlReferenceHandler* _pDlg
) :
ModalDialog( pParent, ModuleRes(RID_FORMULADLG_FORMULA_MODAL) ),
m_pImpl( new FormulaDlg_Impl(this,_bSupportFunctionResult
, _bSupportResult
, _bSupportMatrix
-,_pHelper,_pFunctionMgr,_pDlg))
+,this,_pFunctionMgr,_pDlg))
{
FreeResource();
SetText(m_pImpl-aTitle1);
@@ -1745,12 +1744,12 @@ FormulaDlg::FormulaDlg( SfxBindings* pB,
SfxChildWindow* pCW,
, bool _bSupportFunctionResult
, bool _bSupportResult
, bool _bSupportMatrix
-, IFormulaEditorHelper* _pHelper,IFunctionManager*
_pFunctionMgr,IControlReferenceHandler* _pDlg ) :
+, IFunctionManager* _pFunctionMgr,
IControlReferenceHandler* _pDlg ) :
SfxModelessDialog( pB, pCW, pParent, ModuleRes(RID_FORMULADLG_FORMULA)
),
m_pImpl( new FormulaDlg_Impl(this, _bSupportFunctionResult
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 175 ++-
1 file changed, 174 insertions(+), 1 deletion(-)
New commits:
commit 7be233e60ab8b4e241510758e269c186e5cf02e3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Mar 21 23:04:44 2012 -0400
New unit test for data pilot grouping (normal grouping).
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c134f13..15c774c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -59,6 +59,7 @@
#include dpshttab.hxx
#include dpobject.hxx
#include dpsave.hxx
+#include dpdimsave.hxx
#include dpcache.hxx
#include formula/IFunctionDescription.hxx
@@ -159,6 +160,8 @@ public:
*/
void testPivotTableDuplicateDataFields();
+void testPivotTableNormalGrouping();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -215,6 +218,7 @@ public:
CPPUNIT_TEST(testPivotTableNamedSource);
CPPUNIT_TEST(testPivotTableCache);
CPPUNIT_TEST(testPivotTableDuplicateDataFields);
+CPPUNIT_TEST(testPivotTableNormalGrouping);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -1289,6 +1293,25 @@ ScDPObject* createDPFromRange(
return createDPFromSourceDesc(pDoc, aSheetDesc, aFields, nFieldCount,
bFilterButton);
}
+ScRange refreshGroups(ScDPCollection* pDPs, ScDPObject* pDPObj)
+{
+// We need to first create group data in the cache, then the group data in
+// the object.
+std::setScDPObject* aRefs;
+bool bSuccess = pDPs-ReloadGroupsInCache(pDPObj, aRefs);
+CPPUNIT_ASSERT_MESSAGE(Failed to reload group data in cache., bSuccess);
+CPPUNIT_ASSERT_MESSAGE(There should be only one table linked to this
cache., aRefs.size() == 1);
+pDPObj-ReloadGroupTableData();
+
+bool bOverFlow = false;
+ScRange aOutRange = pDPObj-GetNewOutputRange(bOverFlow);
+CPPUNIT_ASSERT_MESSAGE(Table overflow!?, !bOverFlow);
+
+pDPObj-Output(aOutRange.aStart);
+aOutRange = pDPObj-GetOutRange();
+return aOutRange;
+}
+
class AutoCalcSwitch
{
ScDocument* mpDoc;
@@ -2083,7 +2106,6 @@ void Test::testPivotTableDuplicateDataFields()
CPPUNIT_ASSERT_MESSAGE(there should be only one data pilot table.,
pDPs-GetCount() == 1);
pDPObj-SetName(pDPs-CreateNewName());
-pDPObj-GetSource();
bool bOverFlow = false;
ScRange aOutRange = pDPObj-GetNewOutputRange(bOverFlow);
@@ -2145,6 +2167,157 @@ void Test::testPivotTableDuplicateDataFields()
m_pDoc-DeleteTab(0);
}
+void Test::testPivotTableNormalGrouping()
+{
+m_pDoc-InsertTab(0, OUString(RTL_CONSTASCII_USTRINGPARAM(Data)));
+m_pDoc-InsertTab(1, OUString(RTL_CONSTASCII_USTRINGPARAM(Table)));
+
+// Raw data
+const char* aData[][2] = {
+{ Name, Value },
+{ A, 1 },
+{ B, 2 },
+{ C, 3 },
+{ D, 4 },
+{ E, 5 },
+{ F, 6 },
+{ G, 7 }
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Value, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE(failed to insert range data at correct position,
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+
+ScDPCollection* pDPs = m_pDoc-GetDPCollection();
+bool bSuccess = pDPs-InsertNewTable(pDPObj);
+
+CPPUNIT_ASSERT_MESSAGE(failed to insert a new pivot table object into
document., bSuccess);
+CPPUNIT_ASSERT_MESSAGE(there should be only one data pilot table.,
+ pDPs-GetCount() == 1);
+pDPObj-SetName(pDPs-CreateNewName());
+
+bool bOverFlow = false;
+ScRange aOutRange = pDPObj-GetNewOutputRange(bOverFlow);
+CPPUNIT_ASSERT_MESSAGE(Table overflow!?, !bOverFlow);
+
+pDPObj-Output(aOutRange.aStart);
+aOutRange = pDPObj-GetOutRange();
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ Name, 0 },
+{ A, 1 },
+{ B, 2 },
+{ C, 3 },
+{ D, 4 },
+{ E, 5 },
+{ F, 6 },
+{ G, 7 },
+{ Total Result, 28 }
+};
+
+bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck,
Initial output without grouping);
+CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
+}
+
+ScDPSaveData* pSaveData = pDPObj-GetSaveData();
+CPPUNIT_ASSERT_MESSAGE(No save data !?, pSaveData);
+ScDPDimensionSaveData* pDimData = pSaveData-GetDimensionData();
+CPPUNIT_ASSERT_MESSAGE(Failed to create dimension data., pDimData);
+
+rtl::OUString
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterSprite.cxx |2 --
sdext/source/presenter/PresenterSprite.hxx |1 -
2 files changed, 3 deletions(-)
New commits:
commit e55595d0e081ccdca41f621177e1b32eb9a649e3
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Mar 20 20:35:01 2012 +0100
maTransform had to go ( was always = identity)
diff --git a/sdext/source/presenter/PresenterSprite.cxx
b/sdext/source/presenter/PresenterSprite.cxx
index aa396eb..2164566 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -44,7 +44,6 @@ PresenterSprite::PresenterSprite (void)
mxSprite(),
maSize(0,0),
maLocation(0,0),
- maTransform(1,0,0, 0,1,0),
mbIsVisible(false),
mnPriority(0),
mnAlpha(1.0)
@@ -142,7 +141,6 @@ void PresenterSprite::ProvideSprite (void)
mxSprite = mxSpriteFactory-createCustomSprite(maSize);
if (mxSprite.is())
{
-mxSprite-transform(maTransform);
mxSprite-move(maLocation,
rendering::ViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
diff --git a/sdext/source/presenter/PresenterSprite.hxx
b/sdext/source/presenter/PresenterSprite.hxx
index 2896712..0478d43 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -73,7 +73,6 @@ private:
::css::uno::Referencecss::rendering::XCustomSprite mxSprite;
css::geometry::RealSize2D maSize;
css::geometry::RealPoint2D maLocation;
-css::geometry::AffineMatrix2D maTransform;
bool mbIsVisible;
double mnPriority;
double mnAlpha;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx| 54 +++--
basctl/source/basicide/basides2.cxx| 20 ++--
basctl/source/basicide/basides3.cxx| 27 --
basctl/source/basicide/basidesh.cxx| 117 +++--
basctl/source/basicide/basobj2.cxx |2
basctl/source/basicide/basobj3.cxx |7 -
basctl/source/basicide/bastypes.cxx|8 -
basctl/source/basicide/localizationmgr.cxx |5 -
basctl/source/inc/basidesh.hxx |7 -
9 files changed, 137 insertions(+), 110 deletions(-)
New commits:
commit 000bb6af72e934d7f0fd2291cea919437cfd5e2f
Author: Noel Grandin n...@peralex.com
Date: Tue Mar 20 10:03:56 2012 +0200
Convert tools/table.hxx usage to std::map in Basic IDE module
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d78f43a..d0c9fba 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -146,6 +146,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
DBG_ASSERT( nWhich, Wich fuer SearchItem ? );
const SfxPoolItem rItem = pArgs-Get( nWhich );
DBG_ASSERT( rItem.ISA( SvxSearchItem ), Kein Searchitem! );
+IDEWindowTable::const_iterator it;
if ( rItem.ISA( SvxSearchItem ) )
{
// memorize item because of the adjustments...
@@ -155,22 +156,20 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
if ( ((const SvxSearchItem)rItem).GetCommand() ==
SVX_SEARCHCMD_REPLACE_ALL )
{
sal_uInt16 nActModWindows = 0;
-IDEBaseWindow* pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
{
+IDEBaseWindow* pWin = it-second;
if ( !pWin-IsSuspended() pWin-IsA( TYPE(
ModulWindow ) ) )
nActModWindows++;
-pWin = aIDEWindowTable.Next();
}
if ( ( nActModWindows = 1 ) || ( !((const
SvxSearchItem)rItem).GetSelection() QueryBox( pCurWin,
WB_YES_NO|WB_DEF_YES, String( IDEResId( RID_STR_SEARCHALLMODULES ) )
).Execute() == RET_YES ) )
{
-pWin = aIDEWindowTable.First();
-while ( pWin )
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
{
+IDEBaseWindow* pWin = it-second;
if ( !pWin-IsSuspended() pWin-IsA( TYPE(
ModulWindow ) ) )
nFound = nFound +
((ModulWindow*)pWin)-StartSearchAndReplace( (const SvxSearchItem)rItem );
-pWin = aIDEWindowTable.Next();
}
}
else
@@ -187,8 +186,15 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
{
// search other modules...
sal_Bool bChangeCurWindow = sal_False;
-aIDEWindowTable.Seek( pCurWin );
-IDEBaseWindow* pWin = aIDEWindowTable.Next();
+for( it = aIDEWindowTable.begin(); it !=
aIDEWindowTable.end(); ++it )
+if ( it-second == pCurWin)
+break;
+if ( it != aIDEWindowTable.end() )
+++it;
+IDEBaseWindow* pWin = NULL;
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
+
sal_Bool bSearchedFromStart = sal_False;
while ( !nFound !bCanceled ( pWin ||
!bSearchedFromStart ) )
{
@@ -200,7 +206,9 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
QueryBox aQuery(pParent,
WB_YES_NO|WB_DEF_YES, ResId::toString(IDEResId(RID_STR_SEARCHFROMSTART)));
if ( aQuery.Execute() == RET_YES )
{
-pWin = aIDEWindowTable.First();
+it = aIDEWindowTable.begin();
+if ( it != aIDEWindowTable.end() )
+pWin = it-second;
bSearchedFromStart = sal_True;
}
else
@@ -222,7 +230,11 @@ void
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/filter/html/htmlpars.cxx | 86 +++--
sc/source/filter/inc/eeimport.hxx |6 +-
sc/source/filter/inc/htmlpars.hxx |6 ++
sc/source/filter/rtf/eeimpars.cxx | 18 +++
4 files changed, 71 insertions(+), 45 deletions(-)
New commits:
commit 7d7e2c3636661c52ff708eb7799f481db5f98dfc
Author: Noel Grandin n...@peralex.com
Date: Mon Mar 19 11:12:51 2012 +0200
Convert tools/table.hxx to std::map in class ScHTMLLayoutParser
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index b9f9fb8..aaae381 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -282,8 +282,8 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
delete pColOffset;
if ( pTables )
{
-for ( Table* pT = (Table*) pTables-First(); pT; pT = (Table*)
pTables-Next() )
-delete pT;
+for( OuterMap::const_iterator it = pTables-begin(); it !=
pTables-end(); ++it)
+delete it-second;
delete pTables;
}
}
@@ -539,7 +539,7 @@ void ScHTMLLayoutParser::Adjust()
SCROW nNextRow = 0;
SCROW nCurRow = 0;
sal_uInt16 nPageWidth = (sal_uInt16) aPageSize.Width();
-Table* pTab = NULL;
+InnerMap* pTab = NULL;
for ( size_t i = 0, nListSize = maList.size(); i nListSize; ++i )
{
ScEEParseEntry* pE = maList[ i ];
@@ -556,7 +556,12 @@ void ScHTMLLayoutParser::Adjust()
}
delete pS;
nTab = pE-nTab;
-pTab = (pTables ? (Table*) pTables-Get( nTab ) : NULL);
+if (pTables)
+{
+OuterMap::const_iterator it = pTables-find( nTab );
+if ( it != pTables-end() )
+pTab = it-second;
+}
}
SCROW nRow = pE-nRow;
@@ -566,8 +571,14 @@ void ScHTMLLayoutParser::Adjust()
pE-nRow = nCurRow = nNextRow;
else
nCurRow = nNextRow = pE-nRow;
-SCROW nR;
-if ( pTab ((nR = (SCROW)(sal_uLong)pTab-Get( nCurRow )) != 0) )
+SCROW nR = 0;
+if ( pTab )
+{
+InnerMap::const_iterator it = pTab-find( nCurRow );
+if ( it != pTab-end() )
+nR = it-second;
+}
+if ( nR )
nNextRow += nR;
else
nNextRow++;
@@ -580,10 +591,21 @@ void ScHTMLLayoutParser::Adjust()
aStack.push( new ScHTMLAdjustStackEntry(
nLastCol, nNextRow, nCurRow ) );
nTab = pE-nTab;
-pTab = (pTables ? (Table*) pTables-Get( nTab ) : NULL);
+if ( pTables )
+{
+OuterMap::const_iterator it = pTables-find( nTab );
+if ( it != pTables-end() )
+pTab = it-second;
+}
// neuer Zeilenabstand
-SCROW nR;
-if ( pTab ((nR = (SCROW)(sal_uLong)pTab-Get( nCurRow )) != 0) )
+SCROW nR = 0;
+if ( pTab )
+{
+InnerMap::const_iterator it = pTab-find( nCurRow );
+if ( it != pTab-end() )
+nR = it-second;
+}
+if ( nR )
nNextRow = nCurRow + nR;
else
nNextRow = nCurRow + 1;
@@ -597,7 +619,10 @@ void ScHTMLLayoutParser::Adjust()
SCROW nRowSpan = pE-nRowOverlap;
for ( SCROW j=0; j nRowSpan; j++ )
{ // aus merged Zeilen resultierendes RowSpan
-SCROW nRows = (SCROW)(sal_uLong)pTab-Get( nRow+j );
+SCROW nRows = 0;
+InnerMap::const_iterator it = pTab-find( nRow+j );
+if ( it != pTab-end() )
+nRows = it-second;
if ( nRows 1 )
{
pE-nRowOverlap += nRows - 1;
@@ -1229,14 +1254,17 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
SCROW nRow = pS-nRowCnt;
sal_uInt16 nTab = pS-nTable;
if ( !pTables )
-pTables = new Table;
+pTables = new OuterMap;
// Hoehen der aeusseren Table
-Table* pTab1 = (Table*) pTables-Get( nTab );
-if ( !pTab1 )
+OuterMap::const_iterator it = pTables-find( nTab );
+InnerMap* pTab1;
+if ( it == pTables-end() )
{
-pTab1 = new Table;
-pTables-Insert( nTab, pTab1 );
+pTab1 = new InnerMap;
+(*pTables)[ nTab ] = pTab1;
}
+else
+pTab1 = it-second;
SCROW nRowSpan = pE-nRowOverlap;
SCROW nRowKGV;
SCROW nRowsPerRow1;
[Libreoffice-commits] .: filter/source
filter/source/svg/svgreader.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 11ccf88eeb8e4148ca532e3a42ddca356ebde811
Author: Christina Rossmanith chrrossman...@web.de
Date: Sat Mar 17 22:06:22 2012 +0100
SVG import: keep aspect ratio when transforming viewbox to viewport
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 5d46c7c..cd5da23 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -293,12 +293,13 @@ struct AnnotatingVisitor
maCurrState.maViewBox.getWidth() != 0.0
maCurrState.maViewBox.getHeight() != 0.0 )
{
-// transform aViewBox into viewport, such that they
-// coincide
+// transform aViewBox into viewport, keep aspect ratio
aLocalTransform.translate(-maCurrState.maViewBox.getMinX(),
-maCurrState.maViewBox.getMinY());
-
aLocalTransform.scale(maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth(),
-
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight());
+double scaleW =
maCurrState.maViewport.getWidth()/maCurrState.maViewBox.getWidth();
+double scaleH =
maCurrState.maViewport.getHeight()/maCurrState.maViewBox.getHeight();
+double scale = (scaleW scaleH) ? scaleW : scaleH;
+aLocalTransform.scale(scale,scale);
}
maCurrState.maCTM =
maCurrState.maCTM*maCurrState.maTransform*aLocalTransform;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
