[Libreoffice-commits] .: sw/source
sw/source/core/layout/paintfrm.cxx | 143 -
1 file changed, 65 insertions(+), 78 deletions(-)
New commits:
commit e94c4ab5523c7dcbee2f1b7fd47685529498e774
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Fri Mar 16 20:47:09 2012 +0100
Conver SV VARARR to std::deque for sw module.
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 958e279..ad0e241 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -32,7 +32,6 @@
#include vcl/sound.hxx
#include vcl/lazydelete.hxx
#include tools/poly.hxx
-#include svl/svstdarr.hxx
#include svx/xoutbmp.hxx
#include sfx2/progress.hxx
#include editeng/brshitem.hxx
@@ -48,7 +47,6 @@
#include switerator.hxx
#include fmtsrnd.hxx
#include fmtclds.hxx
-#include tools/shl.hxx
#include comcore.hrc
#include swmodule.hxx
#include rootfrm.hxx
@@ -81,7 +79,6 @@
#include dbg_lay.hxx
#include accessibilityoptions.hxx
#include docsh.hxx
-#include swtable.hxx
#include svx/svdogrp.hxx
#include sortedobjs.hxx
#include EnhancedPDFExportHelper.hxx
@@ -99,14 +96,14 @@
#include ndole.hxx
#include svtools/chartprettypainter.hxx
#include PostItMgr.hxx
-#include tools/color.hxx
#include vcl/svapp.hxx
#define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230)
#define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200)
#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
-#include svtools/borderhelper.hxx
+#include svtools/borderhelper.hxx //Need for svtools::DrawLine
+#include swtable.hxx //Need for svtools::DrawLine
#include pagefrm.hrc
#include drawinglayer/geometry/viewinformation2d.hxx
@@ -125,6 +122,7 @@
#include basegfx/polygon/b2dpolygon.hxx
#include basegfx/color/bcolortools.hxx
+#include deque
#include algorithm
#include wrtsh.hxx
#include edtwin.hxx
@@ -133,8 +131,6 @@
using namespace ::editeng;
using namespace ::com::sun::star;
-#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()-GetDocShell())
-
//subsidiary lines enabled?
#define IS_SUBS_TABLE \
(pGlobalShell-GetViewOptions()-IsTable() \
@@ -157,8 +153,6 @@ using namespace ::com::sun::star;
!pGlobalShell-GetViewOptions()-IsFormView() \
SwViewOption::IsObjectBoundaries())
-#define SW_MAXBORDERCACHE 20
-
//Class declaration; here because they are only used in this file
#define SUBCOL_PAGE 0x01//Helplines of the page
@@ -195,25 +189,24 @@ public:
sal_Bool MakeUnion( const SwRect rRect );
};
-SV_DECL_VARARR( SwLRects, SwLineRect, 100 )
-
-class SwLineRects : public SwLRects
+class SwLineRects : public std::deque SwLineRect
{
-sal_uInt16 nLastCount; //avoid unnecessary cycles in PaintLines
+std::deque SwLineRect ::iterator nLastCount; //avoid unnecessary cycles
in PaintLines
public:
-SwLineRects() : nLastCount( 0 ) {}
+SwLineRects() : nLastCount( this-begin() ) {}
void AddLineRect( const SwRect rRect, const Color *pColor, const
SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
void ConnectEdges( OutputDevice *pOut );
void PaintLines ( OutputDevice *pOut );
void LockLines( sal_Bool bLock );
-sal_uInt16 Free() const { return nFree; }
+//Limit lines to 100
+bool isFull() const { return this-size()100 ? true : false; }
};
class SwSubsRects : public SwLineRects
{
-void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects ); //;-)
+void RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects );
public:
void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects );
@@ -436,7 +429,6 @@ SwSavePaintStatics::~SwSavePaintStatics()
//- Implementation for the table borders --
-SV_IMPL_VARARR( SwLRects, SwLineRect );
SwLineRect::SwLineRect( const SwRect rRect, const Color *pCol, const
SvxBorderStyle nStyl,
const SwTabFrm *pT, const sal_uInt8 nSCol ) :
@@ -496,9 +488,10 @@ void SwLineRects::AddLineRect( const SwRect rRect, const
Color *pCol, const Svx
//Loop backwards because lines which can be combined, can usually be
painted
//in the same context.
-for ( sal_uInt16 i = Count(); i ; )
+
+for (SwLineRects::iterator it = this-end(); it != this-begin(); --it)
{
-SwLineRect rLRect = operator[](--i);
+SwLineRect rLRect = (*it);
// Test for the orientation, color, table
if ( rLRect.GetTab() == pTab
!rLRect.IsPainted() rLRect.GetSubColor() == nSCol
@@ -510,7 +503,7 @@ void SwLineRects::AddLineRect( const SwRect rRect, const
Color *pCol, const Svx
return;
}
}
-Insert( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ), Count() );
+this-push_back( SwLineRect( rRect, pCol, nStyle, pTab, nSCol ) );
}
void SwLineRects::ConnectEdges( OutputDevice *pOut )
@@
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit a603634f3539d472b66f71419f02a14260dcaf5b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 22 08:12:08 2012 +0100
Fixed previous commit for --enable-dbgutil mode
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d0c9fba..6702f93 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -465,7 +465,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
DBG_ASSERT( rReq.GetArgs(), arguments expected );
const SfxUInt16Item rTabId = (const
SfxUInt16Item)rReq.GetArgs()-Get(SID_BASICIDE_ARG_TABID );
const SfxStringItem rModName = (const
SfxStringItem)rReq.GetArgs()-Get(SID_BASICIDE_ARG_MODULENAME );
-DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
if ( aIDEWindowTable.find( rTabId.GetValue() ) !=
aIDEWindowTable.end() )
{
IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
___
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 |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 09:22:42 2012 +0100
fix debug build
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 6702f93..d9f5b63 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,6 +468,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
if ( aIDEWindowTable.find( rTabId.GetValue() ) !=
aIDEWindowTable.end() )
{
IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
+DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
::rtl::OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin-GetName() );
if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/libcdr-0.0.5-zip.patch libcdr/makefile.mk
libcdr/libcdr-0.0.5-zip.patch | 214 ++
libcdr/makefile.mk|3
2 files changed, 216 insertions(+), 1 deletion(-)
New commits:
commit be79f65e92626a4c6dcda9b31922c53bc7e03349
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 09:54:00 2012 +0100
Some changes in libcdr to appease valgrind
diff --git a/libcdr/libcdr-0.0.5-zip.patch b/libcdr/libcdr-0.0.5-zip.patch
new file mode 100644
index 000..0354cf9
--- /dev/null
+++ b/libcdr/libcdr-0.0.5-zip.patch
@@ -0,0 +1,214 @@
+--- misc/libcdr-0.0.5/src/lib/CDRInternalStream.cpp2012-03-15
11:30:05.0 +0100
misc/build/libcdr-0.0.5/src/lib/CDRInternalStream.cpp 2012-03-22
09:51:18.381882859 +0100
+@@ -49,19 +49,19 @@
+ m_offset(0),
+ m_buffer()
+ {
+- unsigned long tmpNumBytesRead = 0;
+-
+- const unsigned char *tmpBuffer = 0;
++ if (!size)
++return;
+
+ if (!compressed)
+ {
+-tmpBuffer = input-read(size, tmpNumBytesRead);
++unsigned long tmpNumBytesRead = 0;
++const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
+
+ if (size != tmpNumBytesRead)
+ return;
+
+ m_buffer = std::vectorunsigned char(size);
+-memcpy(m_buffer[0], tmpBuffer[0], size);
++memcpy(m_buffer[0], tmpBuffer, size);
+ }
+ else
+ {
+@@ -80,7 +80,8 @@
+ if (ret != Z_OK)
+ return;
+
+-tmpBuffer = input-read(size, tmpNumBytesRead);
++unsigned long tmpNumBytesRead = 0;
++const unsigned char *tmpBuffer = input-read(size, tmpNumBytesRead);
+
+ if (size != tmpNumBytesRead)
+ return;
+@@ -99,6 +100,7 @@
+ case Z_DATA_ERROR:
+ case Z_MEM_ERROR:
+ (void)inflateEnd(strm);
++m_buffer.clear();
+ return;
+ }
+
+@@ -109,7 +111,7 @@
+
+ }
+ while (strm.avail_out == 0);
+-
++(void)inflateEnd(strm);
+ }
+ }
+
+--- misc/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-16 11:20:15.0
+0100
misc/build/libcdr-0.0.5/src/lib/CDRZipStream.cpp 2012-03-22
09:51:00.332335588 +0100
+@@ -30,6 +30,7 @@
+
+
+ #include string.h
++#include zlib.h
+ #include CDRZipStream.h
+ #include CDRInternalStream.h
+ #include libcdr_utils.h
+@@ -231,9 +232,9 @@
+ return true;
+ }
+
+-static bool findCentralDirectoryEnd(WPXInputStream *input, long startOffset)
++static bool findCentralDirectoryEnd(WPXInputStream *input)
+ {
+- input-seek(startOffset, WPX_SEEK_SET);
++ input-seek(0, WPX_SEEK_SET);
+ try
+ {
+ while (!input-atEOS())
+@@ -242,7 +243,6 @@
+ if (signature == CDIR_END_SIG)
+ {
+ input-seek(-4, WPX_SEEK_CUR);
+-startOffset = input-tell();
+ return true;
+ }
+ else
+@@ -256,9 +256,9 @@
+ return false;
+ }
+
+-static bool isZipStream(WPXInputStream *input, long startOffset)
++static bool isZipStream(WPXInputStream *input)
+ {
+- if (!findCentralDirectoryEnd(input, startOffset))
++ if (!findCentralDirectoryEnd(input))
+ return false;
+ CentralDirectoryEnd end;
+ if (!readCentralDirectoryEnd(input, end))
+@@ -276,17 +276,16 @@
+ return true;
+ }
+
+-static bool findDataStream(WPXInputStream *input, unsigned size, bool
compressed, long startOffset, const char *name)
++static bool findDataStream(WPXInputStream *input, CentralDirectoryEntry
entry, const char *name)
+ {
+ unsigned short name_size = strlen(name);
+- if (!findCentralDirectoryEnd(input, startOffset))
++ if (!findCentralDirectoryEnd(input))
+ return false;
+ CentralDirectoryEnd end;
+ if (!readCentralDirectoryEnd(input, end))
+ return false;
+ input-seek(end.cdir_offset, WPX_SEEK_SET);
+- CentralDirectoryEntry entry;
+- while (!input-atEOS() input-tell() startOffset input-tell()
end.cdir_offset + end.cdir_size)
++ while (!input-atEOS() (unsigned)input-tell() end.cdir_offset +
end.cdir_size)
+ {
+ if (!readCentralDirectoryEntry(input, entry))
+ return false;
+@@ -303,17 +302,63 @@
+ return false;
+ if (!areHeadersConsistent(header, entry))
+ return false;
+- size = entry.uncompressed_size;
+- compressed = (entry.compression != 0);
+ return true;
+ }
+
++WPXInputStream *getSubstream(WPXInputStream *input, const char *name)
++{
++ CentralDirectoryEntry entry;
++ if (!findDataStream(input, entry, name))
++return 0;
++ if (!entry.compression)
++return new CDRInternalStream(input, entry.compressed_size);
++ else
++ {
++int ret;
++z_stream strm;
++
++/* allocate inflate state */
++strm.zalloc = Z_NULL;
++strm.zfree = Z_NULL;
++strm.opaque = Z_NULL;
++strm.avail_in = 0;
++strm.next_in = Z_NULL;
++ret = inflateInit2(strm,-MAX_WBITS);
++if (ret != Z_OK)
++ return 0;
++
++unsigned long numBytesRead = 0;
++const unsigned char *compressedData = input-read(entry.compressed_size,
numBytesRead);
++if (numBytesRead != entry.compressed_size)
++ return 0;
++
++strm.avail_in = numBytesRead;
++
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/chart2uno.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e1b4216816ba927f171030101f272f7ec0eb8314
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 22 10:06:16 2012 +0100
ChartTokenMap can contain null pointers
db3786ee3aa0d8911042c9bbcea02cf36d96dfa1 caused chart2_unoapi test to crash
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 469eb1d..9f5e3cd 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -309,9 +309,10 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount,
SCROW nAllRowCount,
ScTokenPtrMap::iterator tokenIter = pCol-begin();
for (SCROW nRow = 0; !bFoundValues nRow
nSmallestValueRowIndex; ++nRow)
{
-if (tokenIter != pCol-end() nRow=nHeaderRowCount)
+ScToken* pToken =
+tokenIter == pCol-end() ? 0 : tokenIter-second;
+if (pToken nRow=nHeaderRowCount)
{
-ScToken* pToken = tokenIter-second;
ScRange aRange;
bool bExternal = false;
StackVar eType = pToken-GetType();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - cppuhelper/inc sal/inc solenv/gbuild unoxml/source
cppuhelper/inc/cppuhelper/implementationentry.hxx |8 sal/inc/sal/types.h |5 - solenv/gbuild/platform/WNT_INTEL_GCC.mk |4 unoxml/source/rdf/librdf_repository.cxx | 12 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) New commits: commit 7ec7f0df2960b74552224f0a9f7489f152b5faa1 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 22 10:36:13 2012 +0100 MinGW apparently needs to be forced into __cdecl ...otherwise bridges/source/cpp_uno/mingw_intel C++ ABI assumptions would not meet what i686-w64-mingw32-g++ emits (though it is unclear to me how this shall ever have worked before, as kendy claims it once did; also, at least for me, wine soffice.exe still does not work, as there is apparently confusion about C++ exception stack unwinding between GCC and cpp_uno/mingw_intel code). diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 7575be4..52b008f 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -256,13 +256,8 @@ typedef void * sal_Handle; #endif // defined(_MSC_VER) # define SAL_DLLPRIVATE # define SAL_DLLPUBLIC_TEMPLATE -#if defined(_MSC_VER) # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl -#else -# define SAL_CALL -# define SAL_CALL_ELLIPSE -#endif #elif defined SAL_UNX # if defined(__SUNPRO_CC) (__SUNPRO_CC = 0x550) # define SAL_DLLPUBLIC_EXPORT __global diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 161ad2c..363f1f3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -45,6 +45,7 @@ gb_COMPILERDEFS += \ -D_NATIVE_WCHAR_T_DEFINED \ -D_MSC_EXTENSIONS \ -D_FORCENAMELESSUNION \ + -DBOOST_MEM_FN_ENABLE_CDECL \ gb_RCDEFS := \ -DWINVER=0x0400 \ commit ab2186d2c699f1ca041f7e3bde9620139a6f671c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 22 10:30:53 2012 +0100 MinGW: other DLLs must not pick sal's special __main diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 7d947ed..161ad2c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -84,8 +84,11 @@ endif gb_LinkTarget_EXCEPTIONFLAGS += \ -fno-enforce-eh-specs \ +# At least sal defines its own __main, which would cause DLLs linking against +# sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o: gb_LinkTarget_LDFLAGS := \ -Wl,--export-all-symbols \ + -Wl,--exclude-symbols,__main \ -Wl,--enable-stdcall-fixup \ -Wl,--enable-runtime-pseudo-reloc-v2 \ $(subst -L../lib , ,$(SOLARLIB)) \ commit 4fc8059d4452e3aca7b1edaf5fba873dca29987b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 22 10:27:48 2012 +0100 Fix SAL_CALL placement (so MinGW won't complain) diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx index 173501d..655ac2b 100644 --- a/cppuhelper/inc/cppuhelper/implementationentry.hxx +++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx @@ -45,17 +45,17 @@ struct ImplementationEntry /** Function that returns the implementation-name of the implementation (same as XServiceInfo.getImplementationName() ). */ - rtl::OUString ( SAL_CALL * getImplementationName )(); + rtl::OUString SAL_CALL ( * getImplementationName )(); /** Function that returns all supported servicenames of the implementation ( same as XServiceInfo.getSupportedServiceNames() ). */ - com::sun::star::uno::Sequence rtl::OUString ( SAL_CALL * getSupportedServiceNames ) (); + com::sun::star::uno::Sequence rtl::OUString SAL_CALL ( * getSupportedServiceNames ) (); /** Function that creates a SingleComponentFactory. */ - ::com::sun::star::uno::Reference ::com::sun::star::lang::XSingleComponentFactory - ( SAL_CALL * createFactory )( + ::com::sun::star::uno::Reference ::com::sun::star::lang::XSingleComponentFactory SAL_CALL + ( * createFactory )( ComponentFactoryFunc fptr, ::rtl::OUString const rImplementationName, ::com::sun::star::uno::Sequence ::rtl::OUString const rServiceNames, commit 17c4bb3be34c234dab7d4986ddae50e6a7bfa065 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 22 10:26:38 2012 +0100 Needless SAL_CALL diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 85b40e9..f97d3be 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -335,7 +335,7 @@ public: const NamedGraphMap_t::iterator SAL_CALL clearGraph( const uno::Reference rdf::XURI i_xName, bool i_Internal = false ); -void SAL_CALL
[Libreoffice-commits] .: oowintool
oowintool | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit a75fd2d50e8c0ad82bcd0bbfeafd6a7f0153b7ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 10:41:44 2012 +0100
Look for properly registered windows sdks instead for random version numbers
diff --git a/oowintool b/oowintool
index ce55e88..06e6607 100755
--- a/oowintool
+++ b/oowintool
@@ -96,15 +96,7 @@ sub print_windows_sdk_home()
{
my ($value, $key);
-$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v6.1/InstallationFolder');
-
-if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v7.1/InstallationFolder');
-}
-
-if (!defined $value) {
-$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
-}
+$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/CurrentInstallFolder');
if (!defined $value) {
$value = reg_get_value
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sal/inc
sal/inc/rtl/bootstrap.h |2 +-
sal/inc/rtl/bootstrap.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 180fc63ab8fe7d37ed3da364784a7f0946b918cb
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 09:57:36 2012 +
rtl::bootstap: rename filename parameter to contain uri
diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 3f89bde..1df1461 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -124,7 +124,7 @@ extern C {
@param pName URL of the ini file; must not be null, must not be the empty
string
*/
-SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pName )
+SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString
*pFileUri )
SAL_THROW_EXTERN_C();
/**
diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx
index 60ad350..789c17c 100644
--- a/sal/inc/rtl/bootstrap.hxx
+++ b/sal/inc/rtl/bootstrap.hxx
@@ -41,9 +41,9 @@ namespace rtl
public:
/**
- @see rtl_bootstrap_setIniFileName()
+ * @see rtl_bootstrap_setIniFileName()
*/
-static inline void SAL_CALL setIniFilename( const ::rtl::OUString
sFile );
+static inline void SAL_CALL setIniFilename( const ::rtl::OUString
sFileUri );
/** Retrieves a bootstrap parameter
@param sName name of the bootstrap value. case insensitive.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source sw/source writerfilter/source
oox/inc/oox/drawingml/drawingmltypes.hxx |2 +-
oox/inc/oox/vml/vmlshape.hxx |1 +
oox/source/token/properties.txt |1 +
oox/source/vml/vmlshape.cxx | 14 +-
oox/source/vml/vmlshapecontext.cxx|1 +
sw/source/core/layout/anchoreddrawobject.cxx |7 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +++
7 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit 51cfbf0cfaec395a99a00f2c20fcba96de9a4427
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Mar 22 10:34:24 2012 +0100
n#751054 fix VML import of absolutely positioned pictures
There were multiple issues here:
- convertEmuToHmm() not handling negative values
- position:absolute style property being ignored
- mso-position-vertical-relative is not converted to
text::RelOrientation
- SwAnchoredDrawObject::_SetPositioningAttr() re-positioning already
positioned objects
- DomainMapper_Impl::PushShapeContext() inserting positioned objects as
character
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx
b/oox/inc/oox/drawingml/drawingmltypes.hxx
index 600b1bc..71174b3 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/oox/inc/oox/drawingml/drawingmltypes.hxx
@@ -156,7 +156,7 @@ inline sal_Int64 convertHmmToEmu( sal_Int32 nValue )
/** Converts the passed 64-bit integer value from EMUs to 1/100 mm. */
inline sal_Int32 convertEmuToHmm( sal_Int64 nValue )
{
-return getLimitedValue sal_Int32, sal_Int64 ( (nValue + EMU_PER_HMM / 2)
/ EMU_PER_HMM, 0, SAL_MAX_INT32 );
+return getLimitedValue sal_Int32, sal_Int64 ( (nValue + EMU_PER_HMM / 2)
/ EMU_PER_HMM, SAL_MIN_INT32, SAL_MAX_INT32 );
}
//
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 1998a02..37e9c09 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -79,6 +79,7 @@ struct ShapeTypeModel
::rtl::OUString maHeight; /// Height of the shape
bounding box (number with unit).
::rtl::OUString maMarginLeft; /// X position of the shape
bounding box to shape anchor (number with unit).
::rtl::OUString maMarginTop;/// Y position of the shape
bounding box to shape anchor (number with unit).
+::rtl::OUString maPositionVerticalRelative; /// The Y position is
relative to this.
StrokeModel maStrokeModel; /// Border line formatting.
FillModel maFillModel;/// Shape fill formatting.
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 176ae08..560f879 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -498,6 +498,7 @@ VerticalAlign
VerticalSplitMode
VerticalSplitPositionTwips
VertOrientPosition
+VertOrientRelation
ViewBox
Visible
VisibleFlag
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c2fbd65..bdecb8b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -42,6 +42,7 @@
#include com/sun/star/text/XTextContent.hpp
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextFrame.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
#include rtl/math.hxx
#include rtl/ustrbuf.hxx
#include oox/drawingml/shapepropertymap.hxx
@@ -59,6 +60,7 @@
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Any;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
namespace oox {
@@ -524,11 +526,21 @@ Reference XShape ComplexShape::implConvertAndInsert(
const Reference XShapes
if( xShape.is() )
{
OUString aGraphicUrl =
rFilter.getGraphicHelper().importEmbeddedGraphicObject( aGraphicPath );
+PropertySet aPropSet( xShape );
if( !aGraphicUrl.isEmpty() )
{
-PropertySet aPropSet( xShape );
aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl );
}
+// If the shape has an absolute position, set the properties
accordingly.
+if
(maTypeModel.maPosition.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(absolute)))
+{
+aPropSet.setProperty(PROP_HoriOrientPosition, rShapeRect.X);
+aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y);
+}
+if
(maTypeModel.maPositionVerticalRelative.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(page)))
+{
+aPropSet.setProperty(PROP_VertOrientRelation,
text::RelOrientation::PAGE_FRAME);
+}
}
return xShape;
}
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index e0e38ce..91703fc 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++
[Libreoffice-commits] .: Branch 'feature/tubes' - 3 commits - Repository.mk tubes/Executable_liboapprover.mk tubes/LibreOfficeApprover.client tubes/LibreOffice.client tubes/Module_tubes.mk tubes/org.f
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 4b088d4ee611f05a003acc6146afba7a574c5e66
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 4da2b141304a47a300c97406b44d6aec05ce1bf3
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..e454611
--- /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.freedesktop.Telepathy.Client.LibreOfficeTeleTest
+
diff --git a/tubes/LibreOfficeApprover.client b/tubes/LibreOfficeApprover.client
new file mode 100644
index 000..da6d511
--- /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.freedesktop.Telepathy.Client.LibreOfficeTeleTest
+
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
[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/CppunitTest_tubes_test.mk tubes/qa tubes/test-config.ini
tubes/CppunitTest_tubes_test.mk |2 ++
tubes/qa/test_manager.cxx | 22 +++---
tubes/test-config.ini |3 +++
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 16e48ea17024c7b97b3048bf4463ae443f930455
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 10:43:57 2012 +
tubes: move hardcoded test accounts to an .ini file
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index 7b558d7..57a53a5 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -33,6 +33,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,tubes_test, \
$(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
tubes \
sal \
+unotest \
$(gb_STDLIBS) \
))
@@ -42,6 +43,7 @@ $(eval $(call gb_CppunitTest_add_libs,tubes_test, \
$(eval $(call gb_CppunitTest_set_include,tubes_test,\
-I$(realpath $(SRCDIR)/tubes/inc) \
+-I$(realpath $(OUTDIR)/inc/udkapi) \
$$(TELEPATHY_CFLAGS) \
$$(INCLUDE) \
))
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 69266d0..63077dc 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -37,10 +37,12 @@
#include cppunit/plugin/TestPlugIn.h
#include rtl/string.hxx
#include rtl/ustring.hxx
+#include rtl/bootstrap.hxx
+#include unotest/bootstrapfixturebase.hxx
namespace {
-class TestTeleTubes: public CppUnit::TestFixture
+class TestTeleTubes: public test::BootstrapFixtureBase
{
public:
@@ -83,22 +85,28 @@ public:
CPPUNIT_TEST( testFailAlways ); // need failure to display SAL_LOG,
comment out for real builds
CPPUNIT_TEST_SUITE_END();
+private:
+// XXX The Jabber accounts specified in test-config.ini need to be setup in
+// Empathy, enabled, connected, and on each other's rosters.
+rtl::BootstrapmaTestConfig;
+
+rtl::OUString maAcc1;
+rtl::OUString maAcc2;
};
// static, not members, so they actually survive cppunit test iteration
static TeleManager* mpManager1 = NULL;
static TeleManager* mpManager2 = NULL;
-// XXX The accounts need to be setup in Empathy and a jabber daemon needs
-// to be running on localhost.localdomain and both accounts need to be
-// enabled and connected.
-static rtl::OUString sAcc1( RTL_CONSTASCII_USTRINGPARAM(
libo1@localhost.localdomain));
-static rtl::OUString sAcc2( RTL_CONSTASCII_USTRINGPARAM(
libo2@localhost.localdomain));
static sal_uInt32 nSentPackets = 0;
TestTeleTubes::TestTeleTubes()
+: maTestConfig(getURLFromSrc(/tubes/test-config.ini))
{
TeleManager::addSuffixToNames( TeleTest);
+
+CPPUNIT_ASSERT( maTestConfig.getFrom(offerer, maAcc1));
+CPPUNIT_ASSERT( maTestConfig.getFrom(accepter, maAcc2));
}
TestTeleTubes::~TestTeleTubes()
@@ -182,7 +190,7 @@ void TestTeleTubes::testPrepareAccountManager2()
void TestTeleTubes::testStartBuddySession1()
{
-bool bStarted = mpManager1-startBuddySession( sAcc1, sAcc2);
+bool bStarted = mpManager1-startBuddySession( maAcc1, maAcc2);
CPPUNIT_ASSERT( bStarted == true);
}
diff --git a/tubes/test-config.ini b/tubes/test-config.ini
new file mode 100644
index 000..dba2be1
--- /dev/null
+++ b/tubes/test-config.ini
@@ -0,0 +1,3 @@
+# Locally-configured Jabber accounts used by Tubes test suite.
+offerer=libo1@localhost.localdomain
+accepter=libo2@localhost.localdomain
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docdraw.cxx|3 --
sw/source/core/doc/docedt.cxx |9 ++
sw/source/core/docnode/ndcopy.cxx | 56 +++---
sw/source/core/inc/mvsave.hxx |5 +--
4 files changed, 34 insertions(+), 39 deletions(-)
New commits:
commit db51589575d37ca608067ad9904dcc6a09651e8c
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Thu Mar 15 07:26:54 2012 +0100
Convert SVARRAY SORT into STL set
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 2d5671c..cbff064 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -76,9 +76,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::linguistic2;
-
-SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
-
/*
|*
|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 26a2ad8..6c73ba1 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -163,7 +163,6 @@ struct _SaveRedline
SV_DECL_PTRARR_DEL( _SaveRedlines, _SaveRedline*, 0 )
-SV_IMPL_VARARR( _SaveFlyArr, _SaveFly )
SV_IMPL_PTRARR( _SaveRedlines, _SaveRedline* )
bool lcl_MayOverwrite( const SwTxtNode *pNode, const xub_StrLen nPos )
@@ -191,7 +190,7 @@ void _RestFlyInRange( _SaveFlyArr rArr, const
SwNodeIndex rSttIdx,
const SwNodeIndex* pInsertPos )
{
SwPosition aPos( rSttIdx );
-for( sal_uInt16 n = 0; n rArr.Count(); ++n )
+for( size_t n = 0; n rArr.size(); ++n )
{
// create new anchor
_SaveFly rSave = rArr[n];
@@ -234,7 +233,7 @@ void _SaveFlyInRange( const SwNodeRange rRg, _SaveFlyArr
rArr )
{
_SaveFly aSave( pAPos-nNode.GetIndex() - rRg.aStart.GetIndex(),
pFmt, sal_False );
-rArr.Insert( aSave, rArr.Count());
+rArr.push_back( aSave );
pFmt-DelFrms();
rFmts.Remove( n--, 1 );
}
@@ -295,7 +294,7 @@ void _SaveFlyInRange( const SwPaM rPam, const SwNodeIndex
rInsPos,
{
_SaveFly aSave( pAPos-nNode.GetIndex() - rSttNdIdx.GetIndex(),
pFmt, bInsPos );
-rArr.Insert( aSave, rArr.Count());
+rArr.push_back( aSave );
pFmt-DelFrms();
rFmts.Remove( n--, 1 );
}
@@ -1188,7 +1187,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange rRange,
SwNodeIndex rPos,
}
// move the Flys to the new position
-if( aSaveFlyArr.Count() )
+if( !aSaveFlyArr.empty() )
_RestFlyInRange( aSaveFlyArr, aIdx, NULL );
// Add the Bookmarks back to the Document
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 4aabfba..97557f2 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -53,6 +53,8 @@
#include pagedesc.hxx
#include poolfmt.hxx
#include SwNodeNum.hxx
+#include set
+#include vector
#ifdef DBG_UTIL
#define CHECK_TABLE(t) (t).CheckConsistency();
@@ -328,7 +330,7 @@ sal_Bool lcl_CopyTblLine( const SwTableLine* rpLine, void*
pPara );
sal_Bool lcl_CopyTblBox( const SwTableBox* rpBox, void* pPara )
{
-_CopyTable* pCT = (_CopyTable*)pPara;
+_CopyTable* pCT = reinterpret_cast _CopyTable* (pPara);
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rpBox-GetFrmFmt();
pCT-rMapArr.ForEach( lcl_SrchNew, pBoxFmt );
@@ -392,7 +394,7 @@ sal_Bool lcl_CopyTblBox( const SwTableBox* rpBox, void*
pPara )
sal_Bool lcl_CopyTblLine( const SwTableLine* rpLine, void* pPara )
{
-_CopyTable* pCT = (_CopyTable*)pPara;
+_CopyTable* pCT = reinterpret_cast _CopyTable* (pPara);
SwTableLineFmt* pLineFmt = (SwTableLineFmt*)rpLine-GetFrmFmt();
pCT-rMapArr.ForEach( lcl_SrchNew, pLineFmt );
if( pLineFmt == rpLine-GetFrmFmt() ) // ein neues anlegen ??
@@ -1403,7 +1405,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
//die Ordnungsnummer (wird nur im DrawModel verwaltet)
//beibehalten.
SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
-_ZSortFlys aArr;
+::std::set _ZSortFly aSet;
sal_uInt16 nArrLen = GetSpzFrmFmts()-Count();
for ( sal_uInt16 n = 0; n nArrLen; ++n )
@@ -1467,22 +1469,20 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
}
}
if( bAdd )
-aArr.Insert( _ZSortFly( pFmt, pAnchor, nArrLen + aArr.Count()
));
+aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size()
));
}
}
//Alle kopierten (also die neu erzeugten) Rahmen in ein weiteres Array
//stopfen. Dort sizten sie passend zu den Originalen, damit hinterher
//die Chains entsprechend aufgebaut werden koennen.
-SvPtrarr aNewArr( 10 );
+::std::vector
[Libreoffice-commits] .: sc/source
sc/source/core/data/dptabsrc.cxx |1 - sc/source/core/data/pivot2.cxx|1 - sc/source/core/data/table5.cxx|1 - sc/source/core/tool/interpr4.cxx |1 - sc/source/core/tool/interpr5.cxx |5 - sc/source/filter/excel/excimp8.cxx|1 - sc/source/filter/excel/excrecds.cxx |1 - sc/source/filter/excel/impop.cxx |1 - sc/source/filter/excel/xechart.cxx|1 - sc/source/filter/excel/xestring.cxx |2 -- sc/source/filter/excel/xltoolbar.cxx |1 - sc/source/filter/html/htmlexp.cxx |1 - sc/source/filter/lotus/op.cxx |8 sc/source/filter/xml/xmlexprt.cxx |3 --- sc/source/filter/xml/xmlfonte.cxx |1 - sc/source/filter/xml/xmlimprt.cxx |1 - sc/source/ui/cctrl/tbinsert.cxx |1 - sc/source/ui/docshell/docsh.cxx |1 - sc/source/ui/drawfunc/drawsh.cxx |3 --- sc/source/ui/drawfunc/fuins2.cxx |1 - sc/source/ui/miscdlgs/autofmt.cxx |1 - sc/source/ui/miscdlgs/scuiautofmt.cxx |1 - sc/source/ui/miscdlgs/textdlgs.cxx|1 - sc/source/ui/unoobj/chartuno.cxx |1 - sc/source/ui/unoobj/docuno.cxx|1 - sc/source/ui/unoobj/scdetect.cxx |4 sc/source/ui/unoobj/servuno.cxx |6 -- sc/source/ui/vba/vbaapplication.cxx |4 sc/source/ui/vba/vbarange.cxx |1 - sc/source/ui/vba/vbaworksheet.cxx |1 - sc/source/ui/view/cellsh1.cxx |2 -- sc/source/ui/view/gridwin.cxx |2 -- sc/source/ui/view/preview.cxx |1 - sc/source/ui/view/prevwsh.cxx |2 -- sc/source/ui/view/tabvwsh4.cxx|2 -- sc/source/ui/view/viewfun2.cxx|4 sc/source/ui/view/viewfun3.cxx|2 -- sc/source/ui/view/viewfun4.cxx|1 - sc/source/ui/view/viewfun5.cxx|1 - 39 files changed, 74 deletions(-) New commits: commit eedbe7163bf3979ae392b3b88227ee68e1df12fe Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Mar 22 20:52:52 2012 +0900 removed duplicate includes in sc diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index b69b102..4d680ae 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -63,7 +63,6 @@ #include com/sun/star/beans/PropertyAttribute.hpp #include com/sun/star/sheet/DataPilotFieldFilter.hpp #include com/sun/star/sheet/DataPilotFieldOrientation.hpp -#include com/sun/star/sheet/DataPilotFieldFilter.hpp #include com/sun/star/sheet/DataPilotFieldReferenceType.hpp #include com/sun/star/sheet/DataPilotFieldSortMode.hpp #include com/sun/star/sheet/DataPilotFieldGroupBy.hpp diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index a4c823a..2992023 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -53,7 +53,6 @@ #include refupdat.hxx #include stlpool.hxx #include stlsheet.hxx -#include pivot.hxx using ::com::sun::star::sheet::DataPilotFieldReference; using ::rtl::OUString; diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 020c721..0a7de50 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -44,7 +44,6 @@ #include global.hxx #include rechead.hxx #include stlpool.hxx -#include stlsheet.hxx #include brdcst.hxx #include tabprotection.hxx #include globstr.hrc diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 9c6794b..8764b45 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -40,7 +40,6 @@ #include basic/sbxobj.hxx #include basic/sbuno.hxx #include svl/zforlist.hxx -#include svl/zforlist.hxx #include rtl/logfile.hxx #include stdlib.h #include string.h diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 07dcaf5..6fd612a 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -35,9 +35,6 @@ #include math.h #include stdio.h -#if OSL_DEBUG_LEVEL 1 -#include stdio.h -#endif #include unotools/bootstrap.hxx #include svl/zforlist.hxx @@ -51,8 +48,6 @@ #include globstr.hrc #include cellkeytranslator.hxx -#include string.h -#include math.h #include vector using ::std::vector; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 41d8c38..91d5a01 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -109,7 +109,6 @@ #include com/sun/star/script/ModuleInfo.hpp #include com/sun/star/container/XIndexContainer.hpp #include cppuhelper/component_context.hxx -#include sfx2/app.hxx #include xltoolbar.hxx #include oox/ole/vbaproject.hxx #include oox/ole/olestorage.hxx diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 828b2d6..c8e0856 100644 --- a/sc/source/filter/excel/excrecds.cxx +++
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - .gitignore tubes/inc tubes/qa tubes/README tubes/source tubes/test-config.ini
.gitignore |3 +++
tubes/README | 10 --
tubes/inc/tubes/manager.hxx |6 +++---
tubes/qa/test-config.ini.example |5 +
tubes/qa/test_manager.cxx| 14 ++
tubes/source/manager.cxx | 11 ++-
tubes/test-config.ini|3 ---
7 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 9fc45729868d76f450cdbf3bc427a25f55de61aa
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 11:22:44 2012 +
tubes: Give a useful error when test-config.ini is missing.
diff --git a/.gitignore b/.gitignore
index c1aef58..ce66673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,6 @@ test/user-template/user/psprint/pspfontcache
# Somepeople love debugging
gdbtrace.log
valgrind.log
+
+# Tubes test stuff
+/tubes/qa/test-config.ini
diff --git a/tubes/README b/tubes/README
index 84d4892..3f2f637 100644
--- a/tubes/README
+++ b/tubes/README
@@ -37,12 +37,10 @@ Status 2012-03-20:
is silenced down ... :-(
* for the cppunittest needed:
- * a jabber daemon running on localhost.localdomain
- * two accounts configured in Empathy
-* libo1@localhost.localdomain
-* libo2@localhost.localdomain
- * libo1 and libo2 must be contacts/buddies of each other
- * both accounts need to be online in Empathy
+ * Configure two Jabber accounts in Empathy
+ * Both must be online and on each other's contact list
+ * Copy qa/test-config.ini.example to qa/test-config.ini, and specify those
+two accounts' JIDs in it.
* very nasty GMainLoop handling for cppunittest, HOPEFULLY we will get rid of
that in a real LibO
diff --git a/tubes/qa/test-config.ini.example b/tubes/qa/test-config.ini.example
new file mode 100644
index 000..2d03ca8
--- /dev/null
+++ b/tubes/qa/test-config.ini.example
@@ -0,0 +1,5 @@
+# Locally-configured Jabber accounts used by Tubes test suite. These accounts
+# must both be signed in and on each others' contact lists for the tests to
+# work.
+offerer=libo1@localhost.localdomain
+accepter=libo2@localhost.localdomain
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index f7461ba..ea5806d 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -88,6 +88,7 @@ public:
private:
// XXX The Jabber accounts specified in test-config.ini need to be setup in
// Empathy, enabled, connected, and on each other's rosters.
+rtl::OUString maTestConfigIniURL;
rtl::BootstrapmaTestConfig;
rtl::OUString maAcc1;
@@ -101,12 +102,15 @@ static TeleManager* mpManager2 = NULL;
static sal_uInt32 nSentPackets = 0;
TestTeleTubes::TestTeleTubes()
-: maTestConfig(getURLFromSrc(/tubes/test-config.ini))
+: maTestConfigIniURL(getURLFromSrc(/tubes/qa/test-config.ini)),
+ maTestConfig(maTestConfigIniURL)
{
TeleManager::addSuffixToNames( TeleTest);
-CPPUNIT_ASSERT( maTestConfig.getFrom(offerer, maAcc1));
-CPPUNIT_ASSERT( maTestConfig.getFrom(accepter, maAcc2));
+CPPUNIT_ASSERT_MESSAGE( See README for how to set up test-config.ini,
+maTestConfig.getFrom(offerer, maAcc1));
+CPPUNIT_ASSERT_MESSAGE( See README for how to set up test-config.ini,
+maTestConfig.getFrom(accepter, maAcc2));
}
TestTeleTubes::~TestTeleTubes()
diff --git a/tubes/test-config.ini b/tubes/test-config.ini
deleted file mode 100644
index dba2be1..000
--- a/tubes/test-config.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally-configured Jabber accounts used by Tubes test suite.
-offerer=libo1@localhost.localdomain
-accepter=libo2@localhost.localdomain
commit 8f0ec4cef3f3dc78f27a3e08b68eaa9d0f45608e
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 11:06:42 2012 +
Make startBuddySession() take a TpAccount *.
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 7f325c3..122b959 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -113,7 +113,7 @@ public:
@param rBuddy
The buddy to be connected. Must be a contact of rAccount.
*/
-boolstartBuddySession( const rtl::OUString rAccount,
const rtl::OUString rBuddy );
+boolstartBuddySession( TpAccount *pAccount, const
rtl::OUString rBuddy );
voidunregisterConference( TeleConferencePtr
pConference );
@@ -195,14 +195,14 @@ public:
*/
static void addSuffixToNames( const char* pName );
+TpAccount* getAccount( const rtl::OString rAccountID );
+
private:
TeleConferenceVectormaConferences;
boolmbChannelReadyHandlerInvoked : 1;
-TpAccount* getAccount( const rtl::OString rAccountID );
-
static TeleManagerImpl* pImpl;
static sal_uInt32 nRefCount;
static rtl::OString aNameSuffix;
diff --git a/tubes/qa/test_manager.cxx
[Libreoffice-commits] .: 6 commits - basic/source cosv/source filter/Module_filter.mk shell/source solenv/bin soltools/mkdepend
basic/source/uno/dlgcont.cxx | 11 +--
cosv/source/storage/file.cxx |5 ++---
filter/Module_filter.mk |3 ---
shell/source/unix/sysshell/recently_used_file.cxx |3 ++-
solenv/bin/linkoo |1 -
soltools/mkdepend/pr.c| 10 ++
6 files changed, 11 insertions(+), 22 deletions(-)
New commits:
commit ed0ffbba06f754eea1d37452dbdc684e8a4b72ad
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 22 12:21:20 2012 +
over-engineered thread-safe static OUString
This is a ridiculous over-engineered thread-safe static string for
something which is called so few times, and costs 1k of long-term
memory as the OUString dtor needs to be put into a callback
queue to get called at module unload time.
Just return a new string every time, *rolls eyes*
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 3843039..fa99fe1 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -567,16 +567,7 @@ Sequence OUString
SfxDialogLibraryContainer::getSupportedServiceNames_static(
OUString SfxDialogLibraryContainer::getImplementationName_static()
{
-static OUString aImplName;
-static sal_Bool bNeedsInit = sal_True;
-
-MutexGuard aGuard( Mutex::getGlobalMutex() );
-if( bNeedsInit )
-{
-aImplName =
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.sfx2.DialogLibraryContainer));
-bNeedsInit = sal_False;
-}
-return aImplName;
+return OUString(com.sun.star.comp.sfx2.DialogLibraryContainer);
}
Reference XInterface SAL_CALL SfxDialogLibraryContainer::Create( const
Reference XComponentContext ) throw( Exception )
commit c8587d05bd50c710fdbfae475aa495a8d46e6094
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 22 09:20:22 2012 +
confirmed that tests pass on windows
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 4f9773d..24fe97c 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -75,13 +75,10 @@ $(eval $(call gb_Module_add_targets,filter,\
))
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
# TODO
#$(eval $(call gb_Module_add_subsequentcheck_targets,filter,\
commit 52a6e0a6fa86f80ee91d52abc779b6db667c367a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 22 09:04:18 2012 +
testtool is gone these days
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index daef867..86ac247 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -414,7 +414,6 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
open ($ooenv, $OOO_INSTALL/ . $brand_program_dir . /ooenv) || die
Can't open $OOO_INSTALL/ . $brand_program_dir . /ooenv: $!;
print $ooenv thisdir=$OOO_INSTALL/ . $brand_program_dir . /\n;
print $ooenv $env_script;
-print $ooenv # testtool\nexport SRC_ROOT=$OOO_BUILD\n;
close ($ooenv);
}
commit 1a4276c511240d51e1956d157655d219dc8254fc
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 21:33:04 2012 +
WaE: ignoring lockf return value
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx
b/shell/source/unix/sysshell/recently_used_file.cxx
index 0336a7f..cf27852 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -100,7 +100,8 @@ recently_used_file::recently_used_file() :
//
recently_used_file::~recently_used_file()
{
-lockf(fileno(file_), F_ULOCK, 0);
+int ret = lockf(fileno(file_), F_ULOCK, 0);
+SAL_WARN_IF(ret != 0, shell, cannot unlock recently unused file);
fclose(file_);
}
commit 7dd0898578f9825fe470d58ed2d0e5bc155b66c7
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 21:13:17 2012 +
WaE: ignoring return value of 'fwrite'
diff --git a/cosv/source/storage/file.cxx b/cosv/source/storage/file.cxx
index 16665d7..0618fae 100644
--- a/cosv/source/storage/file.cxx
+++ b/cosv/source/storage/file.cxx
@@ -104,9 +104,8 @@ File::do_write( const void *i_pSrc,
if ( eLastIO == io_write )
::fseek( pStream, 0, SEEK_CUR );
-uintt ret = position();
-::fwrite( i_pSrc, 1, i_nNrofBytes, pStream );
-ret = position() - ret;
+
+uintt ret = ::fwrite( i_pSrc, 1, i_nNrofBytes, pStream );
eLastIO = io_write;
return ret;
commit d7eb0ef560fb6b549f0054140e3b42d0a991bffe
Author: Caolán McNamara caol...@redhat.com
Date: Wed Mar 21 20:50:07 2012 +
WaE: ignoring return value of 'fwrite'
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index 082e312..f472f28 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -29,7
[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
binfilter/bf_sw/source/core/bastyp/sw_index.cxx |8 ++--
binfilter/inc/bf_sw/index.hxx |2 --
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 1ac6932d891754769359cd53041cf46a32723602
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 22 12:28:09 2012 +
WaE: need a virtual dtor
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 1356f25..26cee14 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -309,16 +309,12 @@ int SwIndex::nSerial = 0;
/*N*/ {
/*N*/ }
-#ifdef DBG_UTIL
-
-
/*N*/ SwIndexReg::~SwIndexReg()
/*N*/ {
+#ifdef DBG_UTIL
/*N*/ OSL_ENSURE( !pFirst || !pLast, Es sind noch Indizies angemeldet );
-/*N*/ }
-
#endif
-
+/*N*/ }
/*N*/ void SwIndexReg::Update( const SwIndex rIdx, xub_StrLen nDiff, BOOL
bNeg )
/*N*/ {
diff --git a/binfilter/inc/bf_sw/index.hxx b/binfilter/inc/bf_sw/index.hxx
index b985e72..4d14ea2 100644
--- a/binfilter/inc/bf_sw/index.hxx
+++ b/binfilter/inc/bf_sw/index.hxx
@@ -126,9 +126,7 @@ protected:
public:
SwIndexReg();
-#ifdef DBG_UTIL
virtual ~SwIndexReg();
-#endif
// rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
// kann ueber das SwIndexReg typsicher gecastet werden.
___
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/collab/sendfunc.cxx | 189 ---
sc/source/ui/view/viewfunc.cxx |3
2 files changed, 156 insertions(+), 36 deletions(-)
New commits:
commit 503f0d340997c95d9077be0fec21ee07aa3d4a02
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 12:31:15 2012 +
tubes: chain noddy serialize de-serialize to partial docfunc re-impl.
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index ccc785d..0de59bf 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -27,45 +27,172 @@
*/
#include sal/config.h
+
+#include vector
+
#include cell.hxx
#include docsh.hxx
#include docfunc.hxx
namespace {
-// Ye noddy protocol !
-// method name ',' then arguments comma separated
-class ScChangeOp
+// Ye noddy mangling - needs improvement ...
+// method name ';' then arguments ; separated
+class ScChangeOpWriter
{
rtl::OUStringBuffer aMessage;
+ void appendSeparator()
+ {
+ aMessage.append( sal_Unicode( ';' ) );
+ }
public:
- ScChangeOp( const char *pName )
+
+ ScChangeOpWriter( const char *pName )
+ {
+ aMessage.appendAscii( pName );
+ appendSeparator();
+ }
+
+ void appendString( const rtl::OUString rStr )
{
-aMessage.appendAscii( pName );
-aMessage.append( sal_Unicode( ',' ) );
+ aMessage.append( rStr );
+ appendSeparator();
}
- void appendString( const ScAddress rPos )
+ void appendString( const String rStr )
{
-rtl::OUString aStr;
-rPos.Format( aStr );
-aMessage.append( aStr );
+ aMessage.append( rStr );
+ appendSeparator();
}
void appendAddress( const ScAddress rPos )
{
-(void)rPos;
+ rtl::OUString aStr;
+ rPos.Format( aStr, SCA_VALID );
+ aMessage.append( aStr );
+ appendSeparator();
+ }
+
+ void appendInt( sal_Int32 i )
+ {
+ aMessage.append( i );
+ appendSeparator();
+ }
+
+ void appendBool( sal_Bool b )
+ {
+ aMessage.appendAscii( b ? true : false );
+ appendSeparator();
+ }
+
+ rtl::OString toString()
+ {
+ return rtl::OUStringToOString( aMessage.toString(),
RTL_TEXTENCODING_UTF8 );
}
};
-class ScDocFuncIntercept : public ScDocFunc
+struct ProtocolError {
+const char *message;
+};
+
+class ScChangeOpReader {
+std::vector rtl::OString maArgs;
+
+public:
+
+ScChangeOpReader( const rtl::OString rString)
+{
+// will need to handle escaping etc.
+for (sal_Int32 n = 0; n = 0 n rString.getLength();)
+maArgs.push_back( rString.getToken( 0, ';', n ) );
+}
+~ScChangeOpReader() {}
+
+rtl::OString getMethod()
+{
+return maArgs[0];
+}
+
+size_t getArgCount() { return maArgs.size(); }
+
+rtl::OUString getString( sal_Int32 n )
+{
+if (n 0 (size_t)n getArgCount() )
+return rtl::OUString( maArgs[n].getStr(), maArgs[n].getLength(),
+ RTL_TEXTENCODING_UTF8 );
+else
+return rtl::OUString();
+}
+
+ScAddress getAddress( sal_Int32 n )
+{
+ScAddress aAddr;
+rtl::OUString aToken( getString( n ) );
+aAddr.Parse( aToken );
+return aAddr;
+}
+
+bool getBool( sal_Int32 n )
+{
+if (n 0 (size_t)n getArgCount() )
+return maArgs[n].equalsIgnoreAsciiCase( true );
+else
+return false;
+}
+};
+
+
+class ScDocFuncRecv : public ScDocFunc
{
+ScDocFunc *mpChain;
public:
-ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+// FIXME: really ScDocFunc should be an abstract base
+ScDocFuncRecv( ScDocShell rDocSh, ScDocFunc *pChain )
+: ScDocFunc( rDocSh ),
+ mpChain( pChain )
{
-fprintf( stderr, Interceptor created !\n );
+fprintf( stderr, Receiver created !\n );
}
-virtual ~ScDocFuncIntercept() {}
+virtual ~ScDocFuncRecv() {}
+
+void RecvMessage( const rtl::OString rString )
+{
+try {
+ScChangeOpReader aReader( rString );
+// FIXME: have some hash to enumeration mapping here
+if ( aReader.getMethod() == setNormalString )
+mpChain-SetNormalString( aReader.getAddress( 1 ),
aReader.getString( 2 ),
+ aReader.getBool( 3 ) );
+else
+fprintf( stderr, Error: unknown message '%s' (%d)\n,
+ rString.getStr(), (int)aReader.getArgCount() );
+} catch (const ProtocolError e) {
+fprintf( stderr, Error: protocol twisting '%s'\n, e.message );
+}
+}
+};
+
+class ScDocFuncSend : public ScDocFunc
+{
+ScDocFuncRecv *mpChain;
+
+void SendMessage( ScChangeOpWriter rOp )
+{
+fprintf( stderr, Op: '%s'\n, rOp.toString().getStr() );
+mpChain-RecvMessage( rOp.toString() );
+}
+
+public:
+// FIXME: really ScDocFunc should be
[Libreoffice-commits] .: cppuhelper/inc
cppuhelper/inc/cppuhelper/implementationentry.hxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit aacea7da465b6667e80d87a6c074e092a8908cf6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 22 13:48:45 2012 +0100
Make SAL_CALL placement work with both MinGW and MSVC
diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx
b/cppuhelper/inc/cppuhelper/implementationentry.hxx
index 655ac2b..747ec7f 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -31,6 +31,14 @@
#include cppuhelper/factory.hxx
#include cppuhelperdllapi.h
+// MinGW wants it the one way around while MSVC wants it the other (and
+// everywhere else, SAL_CALL is empty, so doesn't matter):
+#if defined __GNUC__
+#define MY_FN_PTR(name) SAL_CALL (* name)
+#else
+#define MY_FN_PTR(name) (SAL_CALL * name)
+#endif
+
namespace cppu
{
/** One struct instance represents all data necessary for registering one
service implementation.
@@ -45,17 +53,17 @@ struct ImplementationEntry
/** Function that returns the implementation-name of the implementation
(same as XServiceInfo.getImplementationName() ).
*/
- rtl::OUString SAL_CALL ( * getImplementationName )();
+ rtl::OUString MY_FN_PTR( getImplementationName )();
/** Function that returns all supported servicenames of the implementation
( same as XServiceInfo.getSupportedServiceNames() ).
*/
- com::sun::star::uno::Sequence rtl::OUString SAL_CALL ( *
getSupportedServiceNames ) ();
+ com::sun::star::uno::Sequence rtl::OUString MY_FN_PTR(
getSupportedServiceNames ) ();
/** Function that creates a SingleComponentFactory.
*/
- ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleComponentFactory SAL_CALL
- ( * createFactory )(
+ ::com::sun::star::uno::Reference
::com::sun::star::lang::XSingleComponentFactory
+ MY_FN_PTR( createFactory )(
ComponentFactoryFunc fptr,
::rtl::OUString const rImplementationName,
::com::sun::star::uno::Sequence ::rtl::OUString const
rServiceNames,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - tubes/inc tubes/qa tubes/source
tubes/inc/tubes/conference.hxx |3 -
tubes/inc/tubes/manager.hxx| 10 ++
tubes/qa/test_manager.cxx | 63 +
tubes/source/conference.cxx|6 ---
tubes/source/manager.cxx | 12 +++
5 files changed, 60 insertions(+), 34 deletions(-)
New commits:
commit b881624cc1225c2c851bfc391ac4647aa2539b8d
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 12:59:15 2012 +
tubes: make startBuddySession take a TpContact *.
I removed Conference::setTarget() because it's redundant: you can get
the target from the channel. And maTarget was unused anyway.
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 8f68333..b9fd366 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -71,8 +71,6 @@ public:
// --- following only to be called only by manager's callbacks ---
// TODO: make friends instead
-/// bu...@jabber.example.org or r...@conference.example.org or UUID
-voidsetTarget( const rtl::OString rTarget );
voidsetChannel( TpChannel* pChannel );
TpChannel* getChannel() const { return mpChannel; }
boolofferTube();
@@ -92,7 +90,6 @@ public:
private:
-rtl::OStringmaTarget;
rtl::OStringmaSessionId;
TeleManager*mpManager;
TpChannel* mpChannel;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index c704780..10f20ef 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -105,15 +105,13 @@ public:
/** 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 pAccount
+The account to use. This must be a valid Jabber account.
-@param rBuddy
+@param pBuddy
The buddy to be connected. Must be a contact of rAccount.
*/
-boolstartBuddySession( TpAccount *pAccount, const
rtl::OString rBuddy );
+boolstartBuddySession( TpAccount *pAccount, TpContact
*pBuddy);
voidunregisterConference( TeleConferencePtr
pConference );
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index debfef5..b053652 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -224,8 +224,10 @@ void TestTeleTubes::testPrepareAccountManager2()
void TestTeleTubes::testStartBuddySession1()
{
TpAccount *pAcc1 = mpManager1-getAccount(maOffererIdentifier);
-CPPUNIT_ASSERT ( pAcc1 != 0);
-bool bStarted = mpManager1-startBuddySession( pAcc1,
maAccepterIdentifier);
+CPPUNIT_ASSERT( pAcc1 != 0);
+/* This has to run after testContactList has run successfully. */
+CPPUNIT_ASSERT( mpAccepterContact != 0);
+bool bStarted = mpManager1-startBuddySession( pAcc1, mpAccepterContact);
CPPUNIT_ASSERT( bStarted == true);
}
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index f5875e0..830db5f 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -231,12 +231,6 @@ TeleConference::~TeleConference()
}
-void TeleConference::setTarget( const rtl::OString rTarget )
-{
-maTarget = rTarget;
-}
-
-
void TeleConference::setChannel( TpChannel* pChannel )
{
OSL_ENSURE( !mpChannel, TeleConference::setChannel: already have
channel);
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 96c4b3e..5497435 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -392,7 +392,7 @@ bool TeleManager::startGroupSession( const rtl::OUString
rUConferenceRoom, cons
/* TODO: factor out common code with startGroupSession() */
-bool TeleManager::startBuddySession( TpAccount *pAccount, const rtl::OString
rBuddy )
+bool TeleManager::startBuddySession( TpAccount *pAccount, TpContact *pBuddy )
{
INFO_LOGGER( TeleManager::startBuddySession);
@@ -404,16 +404,15 @@ bool TeleManager::startBuddySession( TpAccount *pAccount,
const rtl::OString rB
maConferences.push_back( pConference);
/* TODO: associate the document with this session and conference */
-
-pConference-setTarget( rBuddy);
-
+const char *pIdentifier = tp_contact_get_identifier( pBuddy);
SAL_INFO( tubes, TeleManager::startBuddySession: creating channel
request from
- tp_account_get_path_suffix( pAccount) to
rBuddy.getStr());
+ tp_account_get_path_suffix( pAccount)
+ to pIdentifier);
GHashTable* pRequest = tp_asv_new(
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, TP_TYPE_HANDLE,
TP_HANDLE_TYPE_CONTACT,
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c4da6d5191bbd7ceb299dc422f62987683d743c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Mar 22 14:11:01 2012 +0100 Revert AC_PROG_GREP (I'm pedantic, am I not?) - XCode 2.5.x doesn't know it This reverts commit 4762788eb4ab7f2278861aaf9b9d6d665db61310. diff --git a/configure.in b/configure.in index c6df5f1..cdd4b42 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_PROG_GREP +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] .: basctl/source
basctl/source/basicide/basides1.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0a8596dd8ebbbc80e87d4bdfafe3cf53355b7d43
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Mar 22 14:46:02 2012 +0100
Revert fix debug build
This reverts commit 0589dd3fb5c5bf2fdcdbccfab31fbe26c0a9727d.
Given the find above, this assert will never be triggered anyway
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d9f5b63..6702f93 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -468,7 +468,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
if ( aIDEWindowTable.find( rTabId.GetValue() ) !=
aIDEWindowTable.end() )
{
IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
-DBG_ASSERT( pWin, Window nicht im Liste, aber in TabBar ? );
::rtl::OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin-GetName() );
if ( aNewName != aOldName )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 1e18fdb2fa0812f91685d9580d48e4d2f8452a26
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 22 15:01:35 2012 +0100
MinGW: work around newly ambiguous boost::bind calls with GCC 4.6
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 363f1f3..1ba676f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -34,6 +34,10 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
include $(GBUILDDIR)/platform/com_GCC_defs.mk
include $(GBUILDDIR)/platform/windows.mk
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- \
+'{ print $$1*1+$$2*100+$$3 }')
+gb_GccLess470 := $(shell expr $(gb_CCVER) \ 40700)
+
gb_RC := $(WINDRES)
ifeq ($(GXX_INCLUDE_PATH),)
@@ -45,7 +49,14 @@ gb_COMPILERDEFS += \
-D_NATIVE_WCHAR_T_DEFINED \
-D_MSC_EXTENSIONS \
-D_FORCENAMELESSUNION \
- -DBOOST_MEM_FN_ENABLE_CDECL \
+
+# Until GCC 4.6, MinGW used __cdecl by default, and BOOST_MEM_FN_ENABLE_CDECL
+# would result in ambiguous calls to overloaded boost::bind; since GCC 4.7,
+# MinGW uses __thiscall by default, so now needs BOOST_MEM_FN_ENABLE_CDECL for
+# uses of boost::bind with functions annotated with SAL_CALL:
+ifeq ($(gb_GccLess470),0)
+gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
+endif
gb_RCDEFS := \
-DWINVER=0x0400 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/source
tubes/source/manager.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 52c85e7bfb00696b4b68331ab6139c98d93329b9
Author: Will Thompson will.thomp...@collabora.co.uk
Date: Thu Mar 22 15:40:10 2012 +
tubes manager: fix a compiler warning
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index ed53a10..8dd0fe2 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -164,10 +164,11 @@ static void TeleManager_DBusChannelHandler(
tp_handle_channels_context_accept( pContext);
else
{
-GError aError = { TP_ERRORS, TP_ERROR_CONFUSED,
+GError *pError = g_error_new_literal( TP_ERRORS, TP_ERROR_CONFUSED,
None of these channels were LibreOffice D-Bus tubes;
-why did the Channel Dispatcher give them to us? };
-tp_handle_channels_context_fail( pContext, aError);
+why did the Channel Dispatcher give them to us?);
+tp_handle_channels_context_fail( pContext, pError);
+g_clear_error (pError);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/inc framework/source
framework/inc/services/pathsettings.hxx|4 --
framework/source/services/pathsettings.cxx | 54 +
2 files changed, 26 insertions(+), 32 deletions(-)
New commits:
commit 82af1483c8a259a9f111866f427d04452b27cb47
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 22 13:37:43 2012 +
annoying PATHES-PATHS typos
diff --git a/framework/inc/services/pathsettings.hxx
b/framework/inc/services/pathsettings.hxx
index e587cc5..660a24b 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -63,7 +63,6 @@
/* enable it if you whish to migrate old user settings (using the old cfg
schema) on demand
disable it in case only the new schema must be used.
*/
-#define MIGRATE_OLD_USER_PATHES
namespace framework
{
@@ -213,10 +212,9 @@ class PathSettings : public css::lang::XTypeProvider
,
/** filter real user defined paths from the old configuration schema
and set it as UserPaths on the new schema.
Can be removed with new major release ... */
-#ifdef MIGRATE_OLD_USER_PATHES
+
void impl_mergeOldUserPaths( PathSettings::PathInfo rPath,
const OUStringList lOld );
-#endif
/** reload one path directly from the new configuration schema (because
it was updated by any external code) */
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index 4a5dd53..d70d2b3 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -63,7 +63,7 @@
// __
// non exported const
-const ::rtl::OUString
CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM(UserPaths));
+const ::rtl::OUString
CFGPROP_USERPATHS(RTL_CONSTASCII_USTRINGPARAM(UserPaths));
const ::rtl::OUString
CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM(WritePath));
/*
@@ -73,13 +73,13 @@ const ::rtl::OUString
CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM(WritePath)
3 : write path Template_writestring
*/
-const ::rtl::OUString
POSTFIX_INTERNAL_PATHES(RTL_CONSTASCII_USTRINGPARAM(_internal));
-const ::rtl::OUString
POSTFIX_USER_PATHES(RTL_CONSTASCII_USTRINGPARAM(_user));
+const ::rtl::OUString
POSTFIX_INTERNAL_PATHS(RTL_CONSTASCII_USTRINGPARAM(_internal));
+const ::rtl::OUString POSTFIX_USER_PATHS(RTL_CONSTASCII_USTRINGPARAM(_user));
const ::rtl::OUString
POSTFIX_WRITE_PATH(RTL_CONSTASCII_USTRINGPARAM(_writable));
const sal_Int32 IDGROUP_OLDSTYLE= 0;
-const sal_Int32 IDGROUP_INTERNAL_PATHES = 1;
-const sal_Int32 IDGROUP_USER_PATHES = 2;
+const sal_Int32 IDGROUP_INTERNAL_PATHS = 1;
+const sal_Int32 IDGROUP_USER_PATHS = 2;
const sal_Int32 IDGROUP_WRITE_PATH = 3;
const sal_Int32 IDGROUP_COUNT = 4;
@@ -270,7 +270,7 @@ OUStringList PathSettings::impl_readOldFormat(const
::rtl::OUString sPath)
// NO substitution here ! It's done outside ...
PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString
sPath)
{
-const static ::rtl::OUString
CFGPROP_INTERNALPATHES(RTL_CONSTASCII_USTRINGPARAM(InternalPaths));
+const static ::rtl::OUString
CFGPROP_INTERNALPATHS(RTL_CONSTASCII_USTRINGPARAM(InternalPaths));
const static ::rtl::OUString
CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM(IsSinglePath));
css::uno::Reference css::container::XNameAccess xCfg = fa_getCfgNew();
@@ -283,11 +283,11 @@ PathSettings::PathInfo
PathSettings::impl_readNewFormat(const ::rtl::OUString s
// read internal path list
css::uno::Reference css::container::XNameAccess xIPath;
-xPath-getByName(CFGPROP_INTERNALPATHES) = xIPath;
+xPath-getByName(CFGPROP_INTERNALPATHS) = xIPath;
aPathVal.lInternalPaths xIPath-getElementNames();
// read user defined path list
-aPathVal.lUserPaths xPath-getByName(CFGPROP_USERPATHES);
+aPathVal.lUserPaths xPath-getByName(CFGPROP_USERPATHS);
// read the writeable path
xPath-getByName(CFGPROP_WRITEPATH) = aPathVal.sWritePath;
@@ -332,7 +332,7 @@ void PathSettings::impl_storePath(const
PathSettings::PathInfo aPath)
{
::comphelper::ConfigurationHelper::writeRelativeKey(xCfgNew,
aResubstPath.sPathName,
-CFGPROP_USERPATHES,
+CFGPROP_USERPATHS,
css::uno::makeAny(aResubstPath.lUserPaths.getAsConstList()));
}
@@ -360,7 +360,6 @@ void PathSettings::impl_storePath(const
PathSettings::PathInfo aPath)
}
//-
-#ifdef MIGRATE_OLD_USER_PATHES
void PathSettings::impl_mergeOldUserPaths(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/doc/doc.cxx |1
sw/source/core/inc/layouter.hxx |9
sw/source/core/layout/layouter.cxx | 48
sw/source/core/layout/objectformattertxtfrm.cxx |6 ---
sw/source/core/text/txtfly.cxx |3 -
5 files changed, 1 insertion(+), 66 deletions(-)
New commits:
commit b4b8f6966d5c2d308874f6213e68ecc620e92777
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Mar 22 14:52:37 2012 +0100
n#750258: removed strange non-wrapping condition
In the bug file, some text wrapping was badly computed when showing the
document (but not at the first rendering) due to that weird NotToWrap
mecahnism in SwLayouter. Checked the original issue i#40155 that
removing this does hurt.
(cherry picked from commit 8a233f17ae589b33e3b54ef9ebb1fcff41ef6cd7)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index d07ef90..5a2f44c 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1822,7 +1822,6 @@ void SwDoc::ClearSwLayouterEntries()
{
SwLayouter::ClearMovedFwdFrms( *this );
SwLayouter::ClearObjsTmpConsiderWrapInfluence( *this );
-SwLayouter::ClearFrmsNotToWrap( *this );
// #i65250#
SwLayouter::ClearMoveBwdLayoutInfo( *this );
}
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 135263e..4350b95 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -68,9 +68,6 @@ class SwLayouter
SwMovedFwdFrmsByObjPos* mpMovedFwdFrms;
// -- #i35911#
SwObjsMarkedAsTmpConsiderWrapInfluence* mpObjsTmpConsiderWrapInfl;
-// -- #i40155# - data structure to collect frames, which are
-// marked not to wrap around objects.
-std::vector const SwFrm* maFrmsNotToWrap;
public:
// -- #i65250#
@@ -148,12 +145,6 @@ public:
static void InsertObjForTmpConsiderWrapInfluence(
const SwDoc _rDoc,
SwAnchoredObject _rAnchoredObj );
-// -- #i40155#
-static void ClearFrmsNotToWrap( const SwDoc _rDoc );
-static void InsertFrmNotToWrap( const SwDoc _rDoc,
-const SwFrm _rFrm );
-static bool FrmNotToWrap( const IDocumentLayoutAccess _rIDLA,
- const SwFrm _rFrm );
// -- #i65250#
static bool MoveBwdSuppressed( const SwDoc p_rDoc,
const SwFlowFrm p_rFlowFrm,
diff --git a/sw/source/core/layout/layouter.cxx
b/sw/source/core/layout/layouter.cxx
index 3105bce..5ed1712 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -440,54 +440,6 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence(
_rDoc.GetLayouter()-mpObjsTmpConsiderWrapInfl-Insert( _rAnchoredObj );
}
-// #i40155#
-void SwLayouter::ClearFrmsNotToWrap( const SwDoc _rDoc )
-{
-if ( _rDoc.GetLayouter() )
-{
-const_castSwDoc(_rDoc).GetLayouter()-maFrmsNotToWrap.clear();
-}
-}
-
-void SwLayouter::InsertFrmNotToWrap( const SwDoc _rDoc,
- const SwFrm _rFrm )
-{
-if ( !_rDoc.GetLayouter() )
-{
-const_castSwDoc(_rDoc).SetLayouter( new SwLayouter() );
-}
-
-if ( !SwLayouter::FrmNotToWrap( _rDoc, _rFrm ) )
-{
-const_castSwDoc(_rDoc).GetLayouter()-maFrmsNotToWrap.push_back(
_rFrm );
-}
-}
-
-bool SwLayouter::FrmNotToWrap( const IDocumentLayoutAccess _rDLA,
- const SwFrm _rFrm )
-{
-const SwLayouter* pLayouter = _rDLA.GetLayouter();
-if ( !pLayouter )
-{
-return false;
-}
-else
-{
-bool bFrmNotToWrap( false );
-std::vector const SwFrm* ::const_iterator aIter =
-pLayouter-maFrmsNotToWrap.begin();
-for ( ; aIter != pLayouter-maFrmsNotToWrap.end(); ++aIter )
-{
-const SwFrm* pFrm = *(aIter);
-if ( pFrm == _rFrm )
-{
-bFrmNotToWrap = true;
-break;
-}
-}
-return bFrmNotToWrap;
-}
-}
void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm rTxtFrm )
{
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx
b/sw/source/core/layout/objectformattertxtfrm.cxx
index 3ceb54a..c1d8eb8 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -296,9 +296,6 @@ bool SwObjectFormatterTxtFrm::DoFormatObj(
SwAnchoredObject _rAnchoredObj,
mrAnchorTxtFrm.GetFollow()
mrAnchorTxtFrm.GetFollow()-GetOfst() == 0 )
{
-SwLayouter::InsertFrmNotToWrap(
-
*(mrAnchorTxtFrm.FindPageFrm()-GetFmt()-GetDoc()),
-
[Libreoffice-commits] .: starmath/source
starmath/source/parse.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit f52138deee9e129d0566f06d1d2138b6b159d16a Author: Ivan Timofeev timofeev@gmail.com Date: Thu Mar 22 10:03:03 2012 +0400 fdo#41739: Math: do not skip newline on error diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index b386cf3..e5c1ff4 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2424,7 +2424,9 @@ void SmParser::Error(SmParseError eError) AddError(eError, pSNode); -NextToken(); +// Even if the newline token is unexpected, do not skip it. (fdo#41739) +if (m_aCurToken.eType != TNEWLINE) +NextToken(); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - sc/inc sc/source
sc/inc/postit.hxx|2
sc/source/ui/collab/sendfunc.cxx | 204 ++-
sc/source/ui/inc/docfunc.hxx |2
3 files changed, 181 insertions(+), 27 deletions(-)
New commits:
commit bc05d8964c9cfeba00b21b4ba19411da2226d07c
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 17:39:25 2012 +
tubes: escape and quote strings if necessary.
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index d7a30a3..f1aec1b 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -38,13 +38,13 @@ namespace {
rtl::OUString cellToString( ScBaseCell *pCell )
{
-(void)pCell;
+(void)pCell; // FIXME: implement me
return rtl::OUString();
}
ScBaseCell *stringToCell( const rtl::OUString rString )
{
-(void)rString;
+(void)rString; // FIXME: implement me
return NULL;
}
@@ -66,20 +66,20 @@ public:
appendSeparator();
}
- void appendString( const String rStr )
+ void appendString( const rtl::OUString rStr )
{
- String aQuoted( rStr );
- if ( ScGlobal::FindUnquoted( aQuoted, sal_Unicode( '' ) ) !=
STRING_NOTFOUND )
+ if ( rStr.indexOf( sal_Unicode( '' ) ) = 0 ||
+ rStr.indexOf( sal_Unicode( ';' ) ) = 0 )
+ {
+ String aQuoted( rStr );
ScGlobal::AddQuotes( aQuoted, sal_Unicode( '' ) );
- aMessage.append( aQuoted );
+ aMessage.append( aQuoted );
+ }
+ else
+ aMessage.append( rStr );
appendSeparator();
}
- void appendString( const rtl::OUString rStr )
- {
- aMessage.append( String( rStr ) );
- }
-
void appendAddress( const ScAddress rPos )
{
rtl::OUString aStr;
@@ -124,38 +124,49 @@ public:
{
// will need to handle escaping etc.
// Surely someone else wrote this before ! [!?]
-sal_Int32 n = 0, nStart = 0;
enum {
-IN_TEXT, CHECK_QUOTE
-} eState = IN_TEXT;
+IN_TEXT, CHECK_QUOTE, FIND_LAST_QUOTE, SKIP_SEMI
+} eState = CHECK_QUOTE;
-while (n rString.getLength())
+sal_Int32 nStart = 0;
+for (sal_Int32 n = 0; n rString.getLength(); n++)
{
+if (rString[n] == '\\')
+{
+n++; // skip next char
+continue;
+}
switch (eState) {
case CHECK_QUOTE:
if (rString[n] == '')
{
-xub_StrLen nLen = ScGlobal::FindUnquoted( rString, '', n
+ 1 );
-if (nLen == STRING_NOTFOUND)
-{
-fprintf( stderr, Error: no closing '\' \n );
-nLen = rString.getLength();
-}
-maArgs.push_back( rString.copy( n + 1, nLen - n - 1 ) );
-n = nLen;
-if ( nLen rString.getLength() rString[ nLen + 1 ] )
-;
-eState = IN_TEXT;
+nStart = n + 1;
+eState = FIND_LAST_QUOTE;
break;
-} // drop through
+}
+// else drop through
case IN_TEXT:
if (rString[n] == ';')
{
-maArgs.push_back( rString.copy( nStart, n ) );
-n = nStart = n + 1;
+maArgs.push_back( rString.copy( nStart, n - nStart ) );
+nStart = n + 1;
+eState = CHECK_QUOTE;
+}
+break;
+case FIND_LAST_QUOTE:
+if (rString[n] == '')
+{
+maArgs.push_back( rString.copy( nStart, n - nStart ) );
+eState = SKIP_SEMI;
+break;
+}
+break;
+case SKIP_SEMI:
+if (rString[n] == ';')
+{
+nStart = n + 1;
eState = CHECK_QUOTE;
-} else
-n++;
+}
break;
}
}
commit 7cb8ce011729046c38837798afe0b6d96c0ff2e6
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 17:06:27 2012 +
tubes: proxy more docfunc functions, and improve escaping / parsing
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index e553c92..0237020 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -310,8 +310,6 @@ public:
void CopyFromClip(const ScNotes maNotes, ScDocument* pDoc, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, SCTAB nTab, bool
bCloneCaption);
void erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool
bForgetCaption = false);
-
-
};
//
diff --git
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source
sc/source/ui/collab/sendfunc.cxx | 38 ++
sc/source/ui/inc/docfunc.hxx |3 +--
2 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 96fc7b84dd6820acd6fb59116ee69bf383bbdb80
Author: Michael Meeks michael.me...@suse.com
Date: Thu Mar 22 19:44:44 2012 +
tubes: re-use autorecovery to serialize to a file for exchange
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index f1aec1b..9d9a10c 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -34,6 +34,14 @@
#include docsh.hxx
#include docfunc.hxx
+// new file send/recv fun ...
+#include unotools/tempfile.hxx
+#include unotools/localfilehelper.hxx
+#include comphelper/mediadescriptor.hxx
+#include com/sun/star/document/XDocumentRecovery.hpp
+
+namespace css = ::com::sun::star;
+
namespace {
rtl::OUString cellToString( ScBaseCell *pCell )
@@ -282,6 +290,32 @@ class ScDocFuncSend : public ScDocFunc
mpChain-RecvMessage( rOp.toString() );
}
+void SendFile( const rtl::OUString rURL )
+{
+(void)rURL;
+
+String aTmpPath = utl::TempFile::CreateTempName();
+aTmpPath.Append( rtl::OUString( .ods ) );
+
+rtl::OUString aFileURL;
+::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL );
+
+::comphelper::MediaDescriptor aDescriptor;
+// some issue with hyperlinks:
+aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] =
::rtl::OUString();
+try {
+css::uno::Reference css::document::XDocumentRecovery
xDocRecovery(
+rDocShell.GetBaseModel(), css::uno::UNO_QUERY_THROW);
+
+xDocRecovery-storeToRecoveryFile( aFileURL,
aDescriptor.getAsConstPropertyValueList() );
+} catch (const css::uno::Exception ex) {
+fprintf( stderr, exception foo !\n );
+}
+
+fprintf( stderr, Temp file is '%s'\n,
+ rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8
).getStr() );
+}
+
public:
// FIXME: really ScDocFunc should be an abstract base, so
// we don't need the rDocSh hack/pointer
@@ -314,6 +348,10 @@ public:
aOp.appendString( rText );
aOp.appendBool( bApi );
SendMessage( aOp );
+
+if ( rtl::OUString( rText ) == saveme )
+SendFile( rText );
+
return true; // needs some code auditing action
}
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index e47442e..1303f5e 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -57,7 +57,7 @@ struct ScCellMergeOption;
class ScDocFunc
{
-private:
+protected:
ScDocShellrDocShell;
sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool bPaint =
true );
@@ -67,7 +67,6 @@ private:
sal_Bool rCancel, sal_Bool bApi );
voidNotifyInputHandler( const ScAddress rPos );
-protected:
ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
public:
virtual ~ScDocFunc() {}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/Library_sc.mk tubes/Module_tubes.mk tubes/Package_inc.mk
sc/Library_sc.mk | 23 +++ tubes/Module_tubes.mk |1 + tubes/Package_inc.mk | 39 +++ 3 files changed, 63 insertions(+) New commits: commit 276c2a616000acc8890740ab9503da3b73e872e6 Author: Eike Rathke er...@redhat.com Date: Thu Mar 22 21:31:31 2012 +0100 tubes: pull in tubes headers and linkage diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index a3554ce..42fd0fd 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -45,6 +45,28 @@ $(eval $(call gb_Library_add_api,sc,\ udkapi \ )) + +ifeq ($(ENABLE_TELEPATHY),TRUE) + +$(eval $(call gb_Library_add_linked_libs,sc,\ + tubes \ +)) + +$(eval $(call gb_Library_add_cxxflags,sc,\ + $$(TELEPATHY_CFLAGS) \ +)) + +$(eval $(call gb_Library_add_libs,sc,\ + $$(TELEPATHY_LIBS) \ +)) + +$(eval $(call gb_Library_use_externals,sc,\ + telepathy \ +)) + +endif + + $(eval $(call gb_Library_add_linked_libs,sc,\ avmedia \ basegfx \ @@ -313,6 +335,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/collab \ sc/source/ui/collab/sendfunc \ sc/source/ui/dbgui/asciiopt \ sc/source/ui/dbgui/consdlg \ diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk index fb1c9d7..5746ce5 100644 --- a/tubes/Module_tubes.mk +++ b/tubes/Module_tubes.mk @@ -31,6 +31,7 @@ ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Module_add_targets,tubes,\ Library_tubes \ + Package_inc \ Executable_liboapprover \ )) diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk new file mode 100644 index 000..3ac8876 --- /dev/null +++ b/tubes/Package_inc.mk @@ -0,0 +1,39 @@ +# -*- 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., Eike Rathke er...@redhat.com +# +# 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_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc)) + +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/conference.hxx,tubes/conference.hxx)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/constants.h,tubes/constants.h)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/file-transfer-helper.h,tubes/file-transfer-helper.h)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/packet.hxx,tubes/packet.hxx)) +$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h)) + +#$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/,tubes/)) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - android/Bootstrap android/experiments configure.in sal/android sal/osl vcl/source
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
| 20 -
android/experiments/DocumentLoader/AndroidManifest.xml
|2
android/experiments/DocumentLoader/Makefile
| 180 +++---
android/experiments/DocumentLoader/jni/Android.mk
|8
android/experiments/DocumentLoader/jni/Application.mk
|3
android/experiments/DocumentLoader/local.properties.in
|2
android/experiments/DocumentLoader/project.properties
|3
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 45 +-
configure.in
|7
sal/android/lo-bootstrap.c
| 130 +--
sal/osl/unx/process_impl.cxx
|3
vcl/source/app/svmain.cxx
| 22 +
12 files changed, 331 insertions(+), 94 deletions(-)
New commits:
commit 3e425dfa4b9c2a0198a13b2fb18364a32603080f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Mar 22 22:49:16 2012 +0200
More Android hacking
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 5612fbf..0c31954 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -3,6 +3,19 @@ include ../../../config_host.mk
# The package of this app
APP_PACKAGE=org.libreoffice.android.examples
+# We can't keep assuming APP_DATA_PATH like this, surely this can vary with
+# Android versions and whatnot, this is temporary and works at least with the
+# SDK 16 emulator...
+
+# Probably would be best to just stop fooling around with the possibilities to
+# set various stuff with the -env command line parameters (and environment
+# variables?) and in a plethora of rc files, and hardcode construction of
+# *all* required pathnames based on the app installation location for Android
+# (and iOS), etc. We don't really win anything by having so many layers of
+# configurability on platforms like Android and iOS where apps based on LO
+# code are very much self-contained pre-packaged thingies.
+APP_DATA_PATH=/data/data/$(APP_PACKAGE)
+
SODEST=libs/armeabi-v7a
OBJLOCAL=obj/local/armeabi-v7a
@@ -31,32 +44,65 @@ copy-stuff:
# them.
#
for F in $(strip \
+ analysislo \
+ basebmplo \
+ basegfxlo \
+ bootstrap.uno \
comphelpgcc3 \
+ datelo \
+ expwrap.uno \
+ fastsax.uno \
+ fileacc \
+ fontconfig \
+ forlo \
+ foruilo \
+ freetype \
+ frmlo \
gcc3_uno \
i18nisolang1gcc3 \
+ i18npaperlo \
+ i18npool.uno \
i18nutilgcc3 \
icudatalo \
icui18nlo \
+ iculelo \
icuuclo \
+ introspection.uno \
java_uno \
juh \
juhx \
jvmaccessgcc3 \
+ jvmfwk \
lo-bootstrap \
localedata_en \
localedata_others \
mergedlo \
+ msfilterlo \
+ ooxlo \
+ reflection.uno \
reg \
+ saxlo \
+ sclo \
+ scfiltlo \
+ sotlo \
+ stocservices.uno \
store \
+ svllo \
+ textinstream.uno \
+ tllo \
ucbhelper4gcc3 \
uno_cppu \
+ uno_cppuhelpergcc3 \
uno_sal \
uno_salhelpergcc3 \
uno_cppuhelpergcc3 \
+ unoxmllo \
+ utllo \
+ vbahelperlo \
+ vcllo \
xml2 \
xmlreader \
- bootstrap.uno \
- i18npool.uno \
+ xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
done
@@ -66,14 +112,58 @@ copy-stuff:
#
# Then other assets. Let the directory structure under assets mimic
# that under solver for now.
- mkdir -p assets/bin assets/lib assets/xml/ure
assets/ComponentTarget/i18npool/util
+ mkdir -p assets/bin/ure assets/lib assets/program
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/edit/edundo.cxx |4
sw/source/core/frmedt/feshview.cxx |8
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit f24153cded54954da7f0d80941707715c78e4627
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 22 23:03:05 2012 +0100
fdo#39003: fix autoformat Undo cursors:
SwEditShell::Undo: Because the Undo actions nowadays create new shell
cursors directly (while previously they worked on a SwUndoIter), it is
necessary to remove the shell cursor ring before Pop() because Pop(false)
only restores the current cursor from the stack, not the rest of the ring.
(regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547)
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 95c9252..26b64b0 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -142,6 +142,10 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
.getStr());
}
+if (bRestoreCrsr)
+{ // fdo#39003 Pop does not touch the rest of the cursor ring
+KillPams(); // so call this first to get rid of unwanted cursors
+}
Pop( !bRestoreCrsr );
GetDoc()-SetRedlineMode( eOld );
commit 06d1d69fc8c214251cf9dbc7f87756651657d3bf
Author: Michael Stahl mst...@redhat.com
Date: Thu Mar 22 14:52:41 2012 +0100
SwFEShell::ShouldObjectBeSelected leaks pPos
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 7c6dd99..be852a9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1163,13 +1163,13 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point
rPt)
dynamic_castconst SwTxtFrm*(pCntntFrm);
if ( pTxtFrm )
{
-SwPosition* pPos =
-new SwPosition( *(pTxtFrm-GetTxtNode()) );
+SwPosition aPos( *(pTxtFrm-GetTxtNode()) );
Point aTmpPt( rPt );
-if ( pTxtFrm-GetKeyCrsrOfst( pPos, aTmpPt ) )
+if (pTxtFrm-GetKeyCrsrOfst(aPos, aTmpPt))
{
SwRect aCursorCharRect;
-if ( pTxtFrm-GetCharRect(
aCursorCharRect, *pPos ) )
+if (pTxtFrm-GetCharRect(aCursorCharRect,
+aPos))
{
if ( aCursorCharRect.IsOver( SwRect(
pObj-GetLastBoundRect() ) ) )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |4 1 file changed, 4 insertions(+) New commits: commit 7be7f9a7863cbd862dd5a5462c508db03c56c8d1 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Mar 22 17:26:11 2012 -0500 gbuild: allow the tinderboxes to bypass the dependencies generations diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 119f6e5..5ad2378 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -113,8 +113,12 @@ endif # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) +ifdef TINDERBUILD gb_FULLDEPS := $(false) else +gb_FULLDEPS := $(false) +endif +else gb_FULLDEPS := $(true) endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/scmatrix.cxx | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
New commits:
commit bbe088bc757fa120f50e4e104bdcd46c90f1feb1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 23 02:05:36 2012 +0100
cache calls to mdds:mixed_type_matrix::size, related fdo#47299
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 5256e9a..47ed6e9 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -170,6 +170,7 @@ class ScMatrixImpl
ScMatrix::DensityType meType;
ScInterpreter* pErrorInterpreter;
boolmbCloneIfConst; // Whether the matrix is cloned with a
CloneIfConst() call.
+MatrixImplType::size_pair_type maCachedSize;
ScMatrixImpl();
ScMatrixImpl(const ScMatrixImpl);
@@ -243,6 +244,7 @@ ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR,
ScMatrix::DensityType eType) :
pErrorInterpreter(NULL),
mbCloneIfConst(true)
{
+maCachedSize = maMat.size();
}
ScMatrixImpl::~ScMatrixImpl()
@@ -253,6 +255,7 @@ ScMatrixImpl::~ScMatrixImpl()
void ScMatrixImpl::Clear()
{
maMat.clear();
+maCachedSize = maMat.size();
}
void ScMatrixImpl::SetImmutable(bool bVal)
@@ -268,6 +271,7 @@ bool ScMatrixImpl::IsImmutable() const
void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR)
{
maMat.resize(nR, nC);
+maCachedSize = maMat.size();
}
ScMatrix::DensityType ScMatrixImpl::GetDensityType() const
@@ -282,40 +286,35 @@ void ScMatrixImpl::SetErrorInterpreter( ScInterpreter* p)
void ScMatrixImpl::GetDimensions( SCSIZE rC, SCSIZE rR) const
{
-MatrixImplType::size_pair_type aDims = maMat.size();
-rR = aDims.first;
-rC = aDims.second;
+rR = maCachedSize.first;
+rC = maCachedSize.second;
}
SCSIZE ScMatrixImpl::GetElementCount() const
{
-MatrixImplType::size_pair_type aDims = maMat.size();
-return aDims.first * aDims.second;
+return maCachedSize.first * maCachedSize.second;
}
bool ScMatrixImpl::ValidColRow( SCSIZE nC, SCSIZE nR) const
{
-MatrixImplType::size_pair_type aDims = maMat.size();
-return nR aDims.first nC aDims.second;
+return nR maCachedSize.first nC maCachedSize.second;
}
bool ScMatrixImpl::ValidColRowReplicated( SCSIZE rC, SCSIZE rR ) const
{
-pairsize_t, size_t aDims = maMat.size();
-
-if (aDims.second == 1 aDims.first == 1)
+if (maCachedSize.second == 1 maCachedSize.first == 1)
{
rC = 0;
rR = 0;
return true;
}
-else if (aDims.second == 1 rR aDims.first)
+else if (maCachedSize.second == 1 rR maCachedSize.first)
{
// single column matrix.
rC = 0;
return true;
}
-else if (aDims.first == 1 rC aDims.second)
+else if (maCachedSize.first == 1 rC maCachedSize.second)
{
// single row matrix.
rR = 0;
@@ -639,8 +638,7 @@ bool ScMatrixImpl::IsNumeric() const
void ScMatrixImpl::MatCopy(ScMatrixImpl mRes) const
{
-MatrixImplType::size_pair_type s1 = maMat.size(), s2 = mRes.maMat.size();
-if (s1.first s2.first || s1.second s2.second)
+if (maCachedSize.first mRes.maCachedSize.first || maCachedSize.second
mRes.maCachedSize.second)
{
// destination matrix is not large enough.
OSL_FAIL(ScMatrixImpl::MatCopy: dimension error);
@@ -648,12 +646,14 @@ void ScMatrixImpl::MatCopy(ScMatrixImpl mRes) const
}
mRes.maMat.assign(maMat);
+mRes.maCachedSize = mRes.maMat.size();
}
void ScMatrixImpl::MatTrans(ScMatrixImpl mRes) const
{
mRes.maMat = maMat;
mRes.maMat.transpose();
+mRes.maCachedSize = mRes.maMat.size();
}
void ScMatrixImpl::FillDouble( double fVal, SCSIZE nC1, SCSIZE nR1, SCSIZE
nC2, SCSIZE nR2 )
@@ -720,8 +720,7 @@ template typename _Evaluator
bool EvalMatrix(const MatrixImplType rMat)
{
_Evaluator aEval;
-pairsize_t,size_t aDim = rMat.size();
-size_t nRows = aDim.first, nCols = aDim.second;
+size_t nRows = rMat.size().first, nCols = rMat.size().second;
for (size_t i = 0; i nRows; ++i)
{
for (size_t j = 0; j nCols; ++j)
@@ -911,7 +910,7 @@ size_t ScMatrixImpl::Count(bool bCountStrings) const
void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE rC, SCSIZE rR) const
{
-SCSIZE nRowSize = maMat.size().first;
+SCSIZE nRowSize = maCachedSize.first;
rC = nIndex / nRowSize;
rR = nIndex - rC*nRowSize;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/qa
sc/qa/unit/ucalc.cxx | 226 ++-
1 file changed, 225 insertions(+), 1 deletion(-)
New commits:
commit a3d71e97eaf1958a4d5ab41a6b8788c95d85d2bb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 22 21:26:26 2012 -0400
New unit test for pivot table with date grouping.
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 89315af..cb6ab44 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -75,6 +75,7 @@
#include sfx2/docfile.hxx
#include com/sun/star/sheet/DataPilotFieldOrientation.hpp
+#include com/sun/star/sheet/DataPilotFieldGroupBy.hpp
#include com/sun/star/sheet/GeneralFunction.hpp
#include ucbhelper/contentbroker.hxx
@@ -161,8 +162,8 @@ public:
void testPivotTableDuplicateDataFields();
void testPivotTableNormalGrouping();
-
void testPivotTableNumberGrouping();
+void testPivotTableDateGrouping();
void testSheetCopy();
void testSheetMove();
@@ -222,6 +223,7 @@ public:
CPPUNIT_TEST(testPivotTableDuplicateDataFields);
CPPUNIT_TEST(testPivotTableNormalGrouping);
CPPUNIT_TEST(testPivotTableNumberGrouping);
+CPPUNIT_TEST(testPivotTableDateGrouping);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -1245,7 +1247,6 @@ ScDPObject* createDPFromSourceDesc(
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)
{
@@ -2424,6 +2425,123 @@ void Test::testPivotTableNumberGrouping()
m_pDoc-DeleteTab(0);
}
+void Test::testPivotTableDateGrouping()
+{
+m_pDoc-InsertTab(0, OUString(RTL_CONSTASCII_USTRINGPARAM(Data)));
+m_pDoc-InsertTab(1, OUString(RTL_CONSTASCII_USTRINGPARAM(Table)));
+
+// Raw data
+const char* aData[][2] = {
+{ Date, Value },
+{ 2011-01-01, 1 },
+{ 2011-03-02, 2 },
+{ 2012-01-04, 3 },
+{ 2012-02-23, 4 },
+{ 2012-02-24, 5 },
+{ 2012-03-15, 6 },
+{ 2011-09-03, 7 },
+{ 2012-12-25, 8 }
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Date, 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());
+
+ScDPSaveData* pSaveData = pDPObj-GetSaveData();
+CPPUNIT_ASSERT_MESSAGE(No save data !?, pSaveData);
+ScDPDimensionSaveData* pDimData = pSaveData-GetDimensionData();
+CPPUNIT_ASSERT_MESSAGE(No dimension data !?, pDimData);
+
+rtl::OUString aBaseDimName(RTL_CONSTASCII_USTRINGPARAM(Date));
+
+ScDPNumGroupInfo aInfo;
+aInfo.mbEnable = true;
+aInfo.mbAutoStart = true;
+aInfo.mbAutoEnd = true;
+{
+// Turn the Date dimension into months. The first of the date
+// dimensions is always a number-group dimension which replaces the
+// original dimension.
+ScDPSaveNumGroupDimension aGroup(aBaseDimName, aInfo,
sheet::DataPilotFieldGroupBy::MONTHS);
+pDimData-AddNumGroupDimension(aGroup);
+}
+
+{
+// Add quarter dimension. This will be an additional dimension.
+rtl::OUString aGroupDimName =
+pDimData-CreateDateGroupDimName(
+sheet::DataPilotFieldGroupBy::QUARTERS, *pDPObj, true, NULL);
+ScDPSaveGroupDimension aGroupDim(aBaseDimName, aGroupDimName);
+aGroupDim.SetDateInfo(aInfo, sheet::DataPilotFieldGroupBy::QUARTERS);
+pDimData-AddGroupDimension(aGroupDim);
+
+// Set orientation.
+ScDPSaveDimension* pDim = pSaveData-GetDimensionByName(aGroupDimName);
+pDim-SetOrientation(sheet::DataPilotFieldOrientation_ROW);
+pSaveData-SetPosition(pDim, 0); // set it to the left end.
+}
+
+{
+// Add year dimension. This is a new dimension also.
+rtl::OUString aGroupDimName =
+pDimData-CreateDateGroupDimName(
+sheet::DataPilotFieldGroupBy::YEARS, *pDPObj, true, NULL);
+ScDPSaveGroupDimension aGroupDim(aBaseDimName, aGroupDimName);
+
[Libreoffice-commits] .: svtools/source
svtools/source/control/valueacc.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ffc7968ef27d662bdb2b7418eb0344039312f0bb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 23 02:56:41 2012 +0100
Memcheck: Jump depends on unitialised variable
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index 22680c4..37c48c2 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -48,6 +48,7 @@ ValueSetItem::ValueSetItem( ValueSet rParent )
: mrParent(rParent)
, mnId(0)
, meType(VALUESETITEM_NONE)
+, mbVisible(true)
, mpData(NULL)
, mpxAcc(NULL)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/dpobject.hxx|1 +
sc/source/core/data/dpobject.cxx | 12
sc/source/core/data/dpsave.cxx |2 +-
sc/source/ui/docshell/dbdocfun.cxx |3 +++
sc/source/ui/view/gridwin2.cxx |7 +++
5 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 1d8b583b0676f9c9eed8efd092445908ebea26d9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 22 22:20:04 2012 -0400
Get correct string value for group item value.
Unlike the old version, the new version no longer stores string value
for non-string items. We need to call GetFormattedString() for that.
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index e112e6c..5255b72 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1246,7 +1246,7 @@ void
ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
for (size_t j = 0; j mMemberCount; ++j)
{
const ScDPItemData* pMemberData = pData-GetMemberById( nDimIndex,
rMembers[j] );
-::rtl::OUString aMemName = pMemberData-GetString();
+rtl::OUString aMemName = pData-GetFormattedString(nDimIndex,
*pMemberData);
if (iter-GetExistingMemberByName(aMemName))
// this member instance already exists. nothing to do.
continue;
commit 7f68157264ec5c474b2a0827d2ee35af20ff0c3d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 22 22:03:55 2012 -0400
When updating pivot table with groups, we need to clear the table data.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 917759d..8c1ed99 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -138,6 +138,7 @@ public:
voidInvalidateData();
void ClearTableData();
void ReloadGroupTableData();
+bool HasGroups() const;
voidOutput( const ScAddress rPos );
ScRange GetNewOutputRange( bool rOverflow );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 9da61d1..2f0e510 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -584,6 +584,18 @@ void ScDPObject::ReloadGroupTableData()
bSettingsChanged = true;
}
+bool ScDPObject::HasGroups() const
+{
+if (!pSaveData)
+return false;
+
+const ScDPDimensionSaveData* pDimData =
pSaveData-GetExistingDimensionData();
+if (!pDimData)
+return false;
+
+return pDimData-HasGroupDimensions();
+}
+
void ScDPObject::ClearSource()
{
Reference XComponent xObjectComp( xSource, UNO_QUERY );
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index c1464b1..afb3513 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1327,6 +1327,9 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
if ( pNewObj == pOldObj pDestObj-IsImportData() )
pDestObj-ClearTableData();
+if (pDestObj-HasGroups())
+pDestObj-ClearTableData();
+
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 0f37c83..bf3402c 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -552,9 +552,8 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
return;
ScDPObject* pDPObj = pDPData-mpDPObj;
-ScDPObject aNewDPObj(*pDPObj);
-aNewDPObj.BuildAllDimensionMembers();
-ScDPSaveData* pSaveData = aNewDPObj.GetSaveData();
+pDPObj-BuildAllDimensionMembers();
+ScDPSaveData* pSaveData = pDPObj-GetSaveData();
bool bIsDataLayout;
OUString aDimName = pDPObj-GetDimName(pDPData-mnDim, bIsDataLayout);
@@ -601,7 +600,7 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
pDim-UpdateMemberVisibility(aResult);
ScDBDocFunc aFunc(*pViewData-GetDocShell());
-aFunc.DataPilotUpdate(pDPObj, aNewDPObj, true, false);
+aFunc.DataPilotUpdate(pDPObj, pDPObj, true, false);
}
void ScGridWindow::UpdateVisibleRange()
___
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 | 102 ---
1 file changed, 49 insertions(+), 53 deletions(-)
New commits:
commit e4380ae1e7d5330e26f4a382f3a86a6059b9b53f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 22 23:15:07 2012 -0400
Test for changing dimension member visibility a little cleanup.
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index cb6ab44..965424f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1297,6 +1297,17 @@ ScDPObject* createDPFromRange(
return createDPFromSourceDesc(pDoc, aSheetDesc, aFields, nFieldCount,
bFilterButton);
}
+ScRange refresh(ScDPObject* pDPObj)
+{
+bool bOverFlow = false;
+ScRange aOutRange = pDPObj-GetNewOutputRange(bOverFlow);
+CPPUNIT_ASSERT_MESSAGE(Table overflow!?, !bOverFlow);
+
+pDPObj-Output(aOutRange.aStart);
+aOutRange = pDPObj-GetOutRange();
+return aOutRange;
+}
+
ScRange refreshGroups(ScDPCollection* pDPs, ScDPObject* pDPObj)
{
// We need to first create group data in the cache, then the group data in
@@ -1307,13 +1318,7 @@ ScRange refreshGroups(ScDPCollection* pDPs, ScDPObject*
pDPObj)
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;
+return refresh(pDPObj);
}
class AutoCalcSwitch
@@ -1554,13 +1559,7 @@ void Test::testPivotTableLabels()
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();
-
+ScRange aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][5] = {
@@ -1616,13 +1615,7 @@ void Test::testPivotTableDateLabels()
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();
-
+ScRange aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][5] = {
@@ -1705,12 +1698,7 @@ void Test::testPivotTableFilters()
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();
+ScRange aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
@@ -1743,8 +1731,7 @@ void Test::testPivotTableFilters()
OUString aPage(RTL_CONSTASCII_USTRINGPARAM(A));
pDim-SetCurrentPage(aPage);
pDPObj-SetSaveData(aSaveData);
-pDPObj-Output(aOutRange.aStart);
-aOutRange = pDPObj-GetOutRange();
+aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
@@ -1773,8 +1760,7 @@ void Test::testPivotTableFilters()
rEntry.GetQueryItem().mfVal = 1;
aDesc.SetQueryParam(aQueryParam);
pDPObj-SetSheetDesc(aDesc);
-pDPObj-Output(aOutRange.aStart);
-aOutRange = pDPObj-GetOutRange();
+aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][2] = {
@@ -1852,12 +1838,7 @@ void Test::testPivotTableNamedSource()
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();
+ScRange aOutRange = refresh(pDPObj);
{
// Expected output table content. 0 = empty cell
const char* aOutputCheck[][5] = {
@@ -2111,12 +2092,7 @@ void Test::testPivotTableDuplicateDataFields()
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();
+ScRange aOutRange = refresh(pDPObj);
[Libreoffice-commits] .: sc/source
sc/source/filter/html/htmlexp.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit c4744121f12fde51de2d92d2442d590d93725ffc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 23 04:27:45 2012 +0100
increase nCol before next iteratation to prevent loop, fdo#46220
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 538eb09..af0689a 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -769,7 +769,11 @@ void ScHTMLExport::WriteTables()
while( nCol = nEndCol )
{
if( pDoc-ColHidden(nCol, nTab) )
+{
+++nCol;
continue;
+}
+
if( nWidth != ToPixel( pDoc-GetColWidth( nCol, nTab ) ) )
{
if( nSpan != 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9d2968d6dd12cda797aa31bc0f0798f835cd073a Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Mar 22 23:57:09 2012 -0500 disable gb_FULLDEPS when TINDERBUILD is set _and_ we are really building diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a26f451..d16d33a 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -113,14 +113,14 @@ endif # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) -ifdef TINDERBUILD gb_FULLDEPS := $(false) else +ifdef TINDERBUILD gb_FULLDEPS := $(false) -endif else gb_FULLDEPS := $(true) endif +endif # save user-supplied flags for latter use ifneq ($(strip $(CFLAGS)),) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
