[Libreoffice-commits] .: 2 commits - sfx2/source solenv/gbuild svtools/source svx/source
sfx2/source/doc/objcont.cxx |6 +-
solenv/gbuild/gbuild.help.txt |4
solenv/gbuild/gbuild.mk | 11 +++
svtools/source/filter/filter.cxx |3 +++
svx/source/unodraw/UnoGraphicExporter.cxx |5 +
5 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit bf286107121648bb90c582ac2d56001161915ce4
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Apr 23 23:03:29 2012 +0200
Add some more timelogging, for graphic export here.
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 1034738..398cf85 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -51,6 +51,7 @@
#include svtools/sfxecode.hxx
#include svtools/ehdl.hxx
#include tools/datetime.hxx
+#include rtl/logfile.hxx
#include math.h
#include unotools/saveopt.hxx
@@ -170,7 +171,10 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool
bFullContent ) const
aDevice.SetDigitLanguage( eLang );
-((SfxObjectShell*)this)-DoDraw( aDevice, Point(0,0), aTmpSize,
JobSetup(), nAspect );
+{
+RTL_LOGFILE_PRODUCT_CONTEXT( aLog, PERFORMANCE
SfxObjectShell::CreatePreviewMetaFile_Impl );
+((SfxObjectShell*)this)-DoDraw( aDevice, Point(0,0), aTmpSize,
JobSetup(), nAspect );
+}
pFile-Stop();
return pFile;
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index fb86d9b..634802f 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -68,6 +68,7 @@
#include unotools/localfilehelper.hxx
#include rtl/bootstrap.hxx
#include rtl/instance.hxx
+#include rtl/logfile.hxx
#include vector
#include SvFilterOptionsDialog.hxx
@@ -1714,6 +1715,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const String rPath,
sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const
INetURLObject rPath,
sal_uInt16 nFormat, const uno::Sequence beans::PropertyValue *
pFilterData )
{
+RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) );
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID,
GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID );
sal_BoolbAlreadyExists = ImplDirEntryHelper::Exists( rPath );
@@ -1736,6 +1738,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic
rGraphic, const INetURLO
sal_uInt16 GraphicFilter::ExportGraphic( const Graphic rGraphic, const
String rPath,
SvStream rOStm, sal_uInt16 nFormat, const uno::Sequence
beans::PropertyValue * pFilterData )
{
+RTL_LOGFILE_CONTEXT( aLog, GraphicFilter::ExportGraphic() (thb) );
sal_uInt16 nFormatCount = GetExportFormatCount();
ResetLastError();
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 6ee3ed0..46220ea 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,6 +45,7 @@
#include com/sun/star/task/XInteractionHandler.hpp
#include com/sun/star/task/XInteractionContinuation.hpp
+#include rtl/logfile.hxx
#include comphelper/interaction.hxx
#include framework/interaction.hxx
#include com/sun/star/drawing/GraphicFilterRequest.hpp
@@ -594,6 +595,8 @@ void GraphicExporter::ParseSettings( const Sequence
PropertyValue aDescripto
bool GraphicExporter::GetGraphic( ExportSettings rSettings, Graphic
aGraphic, sal_Bool bVectorType )
{
+RTL_LOGFILE_CONTEXT( aLog, UnoGraphicExporter::GetGraphic (thb) );
+
if( !mpDoc || !mpUnoPage )
return false;
@@ -976,6 +979,8 @@ bool GraphicExporter::GetGraphic( ExportSettings
rSettings, Graphic aGraphic,
sal_Bool SAL_CALL GraphicExporter::filter( const Sequence PropertyValue
aDescriptor )
throw(RuntimeException)
{
+RTL_LOGFILE_CONTEXT( aLog, UnoGraphicExporter::export (thb) );
+
::SolarMutexGuard aGuard;
if( NULL == mpUnoPage )
commit 0c00198b97e9dd7ee4aab0cb2f0e0fed681c852c
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Apr 23 23:02:06 2012 +0200
Resurrect TIMELOG absolute time logging facility
This somehow fell through the cracks of gbuildification -
make timelog=t now again enables those RTL_LOGFILE_ macros.
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 3e17075..6506022 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -62,6 +62,10 @@ INTERACTIVE VARIABLES:
3... = symbols + no optimizations + extra debug output
(usually
extremely verbose). Levels 2 are not used very
much.
+ TIMELOG / timelog
+ If not empty enable the RTL_LOGFILE_* time logging
facility.
+ export RTL_LOGFILE=rtl_logfile.nopid when running
office, to
+ get timestamps written out.
YACCFLAGS Add
[Libreoffice-commits] .: 2 commits - sfx2/source sw/source writerfilter/source
sfx2/source/doc/objstor.cxx |2
sw/source/core/docnode/ndtbl.cxx | 10
sw/source/core/unocore/unotext.cxx |4 +
sw/source/core/view/viewsh.cxx | 32 ---
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2
writerfilter/source/rtftok/rtftokenizer.cxx | 10
6 files changed, 43 insertions(+), 17 deletions(-)
New commits:
commit 234f150f30d881b2691288c5f5581306bd4d3d18
Author: Caolán McNamara caol...@redhat.com
Date: Sat Apr 14 12:45:38 2012 +0100
Resolves: fdo#48640 handle various busted rtf docs without hanging
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e42df41..d8406dc 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium,
bool bInsert )
}
return xLoader-filter( aArgs );
-}catch(const uno::Exception)
+}catch(...)
{}
}
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0817150..7be23f3 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange
rRange, sal_Unicode cCh,
const SwTable* SwDoc::TextToTable( const std::vector std::vectorSwNodeRange
rTableNodes )
{
+if (rTableNodes.empty())
+return NULL;
+
+std::vectorSwNodeRange rFirstRange = *rTableNodes.begin();
+
+if (rFirstRange.empty())
+return NULL;
+
/* Save first node in the selection if it is a content node. */
-SwCntntNode * pSttCntntNd =
rTableNodes.begin()-begin()-aStart.GetNode().GetCntntNode();
+SwCntntNode * pSttCntntNd =
rFirstRange.begin()-aStart.GetNode().GetCntntNode();
/**debug**/
#if OSL_DEBUG_LEVEL 1
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 08e6ce5..2334391 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
std::vectorVerticallyMergedCell aMergedCells;
SwTable const*const pTable = m_pImpl-m_pDoc-TextToTable( aTableNodes );
+
+if (!pTable)
+return uno::Reference text::XTextTable ();
+
SwXTextTable *const pTextTable = new SwXTextTable( *pTable-GetFrmFmt() );
const uno::Reference text::XTextTable xRet = pTextTable;
const uno::Reference beans::XPropertySet xPrSet = pTextTable;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 17b48da..89a71f1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
double nFullWidth = m_nTableWidth;
//the positions have to be distibuted in a range of 1
const double nFullWidthRelative = 1.;
-if( pTableGrid-size() == nGrids )
+if( pTableGrid-size() == nGrids m_nCell 0 )
{
uno::Sequence text::TableColumnSeparator aSeparators( m_nCell - 1 );
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx
b/writerfilter/source/rtftok/rtftokenizer.cxx
index d6dc3ca..125319e 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
{
aBuf.append(ch);
Strm() ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
}
if (aBuf.getLength() 32)
// See RTF spec v1.9.1, page 7
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
{
aParameter.append(ch);
Strm() ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
}
nParam = aParameter.makeStringAndClear().toInt32();
if (bNeg)
commit 1856186951a70a0bcac4e0c3632ca4afe68c05e3
Author: Caolán McNamara caol...@redhat.com
Date: Sat Apr 14 07:56:45 2012 +0100
optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXT
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 774000c..04717dd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -370,25 +370,29 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
if ( GetWin() )
{
Window rWindow = *(GetWin());
-if(rWindow.IsChildTransparentModeEnabled()
rWindow.GetChildCount())
+if (rWindow.IsChildTransparentModeEnabled())
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/appl/impldde.cxx |3 -
sfx2/source/appl/sfxhelp.cxx |3 -
sfx2/source/appl/shutdowniconOs2.cxx | 94 ---
sfx2/source/bastyp/frmhtml.cxx |3 -
sfx2/source/bastyp/progress.cxx |8 --
sfx2/source/doc/docfile.cxx |3 -
sfx2/source/doc/doctempl.cxx |2
sfx2/source/doc/docvor.cxx |1
sfx2/source/doc/frmdescr.cxx |2
sfx2/source/doc/oleprops.cxx |1
10 files changed, 120 deletions(-)
New commits:
commit e194f5bda1c7cb218f649d316122513f571c5180
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Apr 10 06:50:53 2012 +0900
removed unused defines
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ee4c3db..9184f57 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -54,9 +54,6 @@
#include svl/svdde.hxx
#include sot/formats.hxx
-#define DDELINK_COLD0
-#define DDELINK_HOT 1
-
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
#define DDELINK_ERROR_LINK 3
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 80a8f88..1335e1f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -86,9 +86,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::system;
-#define ERROR_TAG String( DEFINE_CONST_UNICODE(Error: ) )
-#define PATH_TAGString( DEFINE_CONST_UNICODE(\nPath: ) )
-
class NoHelpErrorBox : public ErrorBox
{
public:
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index d8b9e18..dc24e35 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -40,9 +40,6 @@
#include sfx2/fcontnr.hxx
#include sfxtypes.hxx
-#define SFX_HTMLFRMSIZE_REL 0x0001
-#define SFX_HTMLFRMSIZE_PERCENT 0x0002
-
static sal_Char const sHTML_SC_yes[] = YES;
static sal_Char const sHTML_SC_no[] = NO;
static sal_Char const sHTML_SC_auto[] = AUTO;
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 22025a6..f31b125 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -82,17 +82,9 @@ struct SfxProgress_Impl
//
-#define TIMEOUT_PROGRESS 5L /* 10th s */
-#define MAXPERCENT_PROGRESS 33
-
-#define TIMEOUT_RESCHEDULE 10L /* 10th s */
-#define MAXPERCENT_RESCHEDULE 50
-
#define Progress
#include sfxslots.hxx
-#define aTypeLibInfo aProgressTypeLibImpl
-
//
extern sal_uInt32 Get10ThSec();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2dc3572..0f30aab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -137,9 +137,6 @@ using namespace ::com::sun::star::io;
#include sfxacldetect.hxx
#include officecfg/Office/Common.hxx
-#define MAX_REDIRECT 5
-
-
//==
namespace {
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index e2733a6..9d3230d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -106,8 +106,6 @@ using ::std::advance;
//
-// #define DONT_USE_HIERARCHY
-
#define TITLE Title
#define IS_FOLDER IsFolder
#define PROPERTY_TYPE TypeDescription
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 00a0037..e9ee57d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -73,7 +73,6 @@
#include comphelper/processfactory.hxx
#include svl/svstdarr.hxx
-static const char cDelim = ':';
sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 760869f..e4f73a2 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -37,8 +37,6 @@
DBG_NAME(SfxFrameDescriptor);
-#define VERSION (sal_uInt16) 3
-
struct SfxFrameDescriptor_Impl
{
Wallpaper* pWallpaper;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index cab4f0a..6a8cf46 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -40,7 +40,6 @@
//
-#define VERSION 11
#define STREAM_BUFFER_SIZE 2048
// usings
commit e5c6f53714335360c360e99b851da64bd2ccf74f
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Apr 10 06:29:09 2012 +0900
removed OS/2 one
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx
b/sfx2/source/appl/shutdowniconOs2.cxx
deleted file mode 100644
index 56932ff..000
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++
[Libreoffice-commits] .: 2 commits - sfx2/source shell/source
sfx2/source/dialog/filedlghelper.cxx | 11 ++-
shell/source/win32/shlxthandler/propsheets/makefile.mk |2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit dc2fe18e95731dcb7c9e2027f45fdaf265490592
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 18:09:41 2012 +0200
fdo#43895 lp#905355: fix the fix so it doesn't crash
rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex = 0 beginIndex = getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 0018912..37a2f29 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1641,8 +1641,17 @@ void FileDialogHelper_Impl::getRealFilter( String
_rFilter ) const
void FileDialogHelper_Impl::verifyPath()
{
#ifdef UNX
+static char const s_FileScheme[] = file://;
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
struct stat aFileStat;
-const OString sFullPath = OUStringToOString(
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName,
osl_getThreadTextEncoding() );
stat( sFullPath.getStr(), aFileStat );
// lp#905355, fdo#43895
// Check that the file has read only permission and is in /tmp -- this is
commit d564c79e6d0780882845a28d8ab32f9eb3dee03b
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 5 12:59:37 2012 +0200
shell: fix silly flags from 2c5a817591
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk
b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 1d67510..08adff7 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -41,7 +41,7 @@ CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE
-D_WIN32_IE=0x501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE
-D_NTSDK -DUNICODE -D_UNICODE
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-CDEFS_X64+=-U_WIN32_IE -D_WIN32_WINNT=0x0501 -U_WIN32_WINNT -D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501
.ENDIF
.IF $(SYSTEM_ZLIB) == YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/dialog/dinfdlg.cxx | 245 +++--
1 file changed, 116 insertions(+), 129 deletions(-)
New commits:
commit 8a997fd7e0e034e27219ce67d73f8195e95a4716
Author: William Gathoye will...@gathoye.be
Date: Mon Mar 5 20:50:56 2012 +
Fix indentation
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 874e455..2b4e06d 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -26,7 +26,6 @@
*
/
-
#include tools/urlobj.hxx
#include vcl/msgbox.hxx
#include svl/eitem.hxx
@@ -85,7 +84,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-
struct CustomProperty
{
::rtl::OUString m_sName;
@@ -99,7 +97,6 @@ struct CustomProperty
{ return m_sName.equals( rProp.m_sName ) m_aValue == rProp.m_aValue; }
};
-
static
bool operator==(const util::DateTime i_rLeft, const util::DateTime i_rRight)
{
@@ -113,7 +110,6 @@ bool operator==(const util::DateTime i_rLeft, const
util::DateTime i_rRight)
}
// STATIC DATA ---
-
TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
const sal_uInt16 HI_NAME = 1;
@@ -121,7 +117,7 @@ const sal_uInt16 HI_TYPE = 2;
const sal_uInt16 HI_VALUE = 3;
const sal_uInt16 HI_ACTION = 4;
-static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
+static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
//
String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True,
sal_Bool bSmartExtraBytes = sal_False );
@@ -326,28 +322,23 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem rItem )
}
//
-
SfxDocumentInfoItem::~SfxDocumentInfoItem()
{
ClearCustomProperties();
}
//
-
SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
{
return new SfxDocumentInfoItem( *this );
}
//
-
int SfxDocumentInfoItem::operator==( const SfxPoolItem rItem) const
{
-if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem))) {
+if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem)))
return false;
-}
-const SfxDocumentInfoItem rInfoItem(
-static_castconst SfxDocumentInfoItem(rItem));
+const SfxDocumentInfoItem rInfoItem(static_castconst
SfxDocumentInfoItem(rItem));
return
m_AutoloadDelay== rInfoItem.m_AutoloadDelay
@@ -372,7 +363,6 @@ int SfxDocumentInfoItem::operator==( const SfxPoolItem
rItem) const
}
//
-
void SfxDocumentInfoItem::resetUserData(const ::rtl::OUString i_rAuthor)
{
setAuthor(i_rAuthor);
@@ -389,7 +379,6 @@ void SfxDocumentInfoItem::resetUserData(const
::rtl::OUString i_rAuthor)
}
//
-
void SfxDocumentInfoItem::UpdateDocumentInfo(
const uno::Referencedocument::XDocumentProperties i_xDocProps,
bool i_bDoNotUpdateUserDefined) const
@@ -462,7 +451,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
//
-
sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const
{
return m_bDeleteUserData;
@@ -639,7 +627,6 @@ bool SfxDocumentInfoItem::PutValue( const Any rVal,
sal_uInt8 nMemberId )
}
//
-
SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet
rItemSet ) :
SfxTabPage( pParent, SfxResId( TP_DOCINFODESC ), rItemSet ),
@@ -660,14 +647,12 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window *
pParent, const SfxItemSet rI
}
//
-
SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet
rItemSet)
{
return new SfxDocumentDescPage(pParent, rItemSet);
}
//
-
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
{
// Test whether a change is present
@@ -675,7 +660,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
const sal_Bool bThemeMod = aThemaEd.IsModified();
const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
const sal_Bool bCommentMod = aCommentEd.IsModified();
-if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
+if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
{
return
[Libreoffice-commits] .: 2 commits - sfx2/source sw/qa
sfx2/source/doc/new.cxx | 12
sw/qa/extras/rtftok/data/n695479.rtf |1 +
sw/qa/extras/rtftok/rtftok.cxx | 11 +++
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit d453788ac0476cc02b929b0907718ca771d6d956
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 15:49:36 2012 +0100
SfxNewFileDialog_Impl: drop unneeded includes
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index da13a06..3be70a3 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -28,7 +28,6 @@
#include comphelper/string.hxx
#include sfx2/new.hxx
-#include vcl/gdimtf.hxx
#include vcl/msgbox.hxx
#include vcl/morebtn.hxx
#include svtools/svmedit.hxx
@@ -41,24 +40,13 @@
#include new.hrc
#include doc.hrc
-#include sfx2/sfx.hrc
-#include helpid.hrc
-#include sfxtypes.hxx
#include sfx2/app.hxx
-#include sfx2/viewfrm.hxx
-#include sfx2/docfac.hxx
#include sfx2/objsh.hxx
-#include fltfnc.hxx
-#include sfx2/viewsh.hxx
-#include sfx2/viewfac.hxx
#include sfx2/sfxresid.hxx
#include sfx2/docfile.hxx
#include preview.hxx
#include sfx2/printer.hxx
#include vcl/waitobj.hxx
-#include vcl/virdev.hxx
-#include vcl/jobset.hxx
-#include svtools/accessibilityoptions.hxx
// Draw modes
#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT)
commit 9fec1e59fa7e92cf91eaf8376f30160edcb86242
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 13:05:37 2012 +0100
testcase for non-box paragraph borders
diff --git a/sw/qa/extras/rtftok/data/n695479.rtf
b/sw/qa/extras/rtftok/data/n695479.rtf
index 213f868..5fe7e45 100644
--- a/sw/qa/extras/rtftok/data/n695479.rtf
+++ b/sw/qa/extras/rtftok/data/n695479.rtf
@@ -1,6 +1,7 @@
{\rtf1
\paperw12240\paperh15840\margl360\margr360\margt360\margb302\gutter0\ltrsect
\pard\plain \ltrpar\ql
\li0\ri0\nowidctlpar\pvpg\posx116\posy2167\absh-300\absw5134\overlay\faauto\rin0\lin0\itap0
+\brdrb\brdrdb\brdrw15\brsp20
\rtlch\fcs1 \af0\afs19\alang1025 \ltrch\fcs0
\fs19\lang1033\langfe1038\loch\af0\hich\af0\dbch\af31505\cgrid\langnp1033\langfenp1038
{\rtlch\fcs1 \af0\afs18 \ltrch\fcs0
\fs18\cf1\lang1038\langfe1038\langnp1038\insrsid10974703
\hich\af0\dbch\af31505\loch\f0 first
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index a1f6521..eb64e0a 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -28,6 +28,8 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/SizeType.hpp
#include com/sun/star/text/XTextDocument.hpp
@@ -198,6 +200,15 @@ void RtfModelTest::testN695479()
uno::Referencetext::XTextRange xRange(xTextContent-getAnchor(),
uno::UNO_QUERY);
uno::Referencetext::XText xText(xRange-getText(),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(RTL_CONSTASCII_USTRINGPARAM(plain)),
xText-getString());
+
+if (i == 0)
+{
+// Additonally, the frist frame should have double border at
the bottom.
+aValue =
xPropertySet-getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BottomBorder)));
+table::BorderLine2 aBorder;
+aValue = aBorder;
+CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE,
aBorder.LineStyle);
+}
}
else if
(xServiceInfo-supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/appl/workwin.cxx |2
sfx2/source/view/viewsh.cxx | 528 +--
2 files changed, 261 insertions(+), 269 deletions(-)
New commits:
commit b46d71a558d935bac5c1f484e9635338b1654728
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Jan 24 17:21:56 2012 +0400
remove unused #define SFX_ITEMTYPE_STATBAR in workwin.cxx
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index f400096..9281858 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1630,8 +1630,6 @@ void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId,
SfxShell*, SfxBindings
aStatBar.nId = sal::static_int_castsal_uInt16(nResId);
}
-#define SFX_ITEMTYPE_STATBAR 4
-
void SfxWorkWindow::UpdateStatusBar_Impl()
{
Reference ::com::sun::star::beans::XPropertySet xPropSet(
GetFrameInterface(), UNO_QUERY );
commit 853768873d2ebc8b9e63bf4f0a16e5867b0a1504
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Jan 24 17:00:27 2012 +0400
sfx2: fix indentation in viewsh.cxx
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c1bf067..70d0d14 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -199,7 +199,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener,
AsyncExecuteHdl_Impl, A
}
void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject
/*rEventObject*/ )
-throw ( uno::RuntimeException )
+throw ( uno::RuntimeException )
{
// Either clipboard or ViewShell is going to be destroyed - no interest
in listening anymore
uno::Reference lang::XComponent xCtrl( m_xCtrl );
@@ -219,7 +219,7 @@ throw ( uno::RuntimeException )
}
void SAL_CALL SfxClipboardChangeListener::changedContents( const
datatransfer::clipboard::ClipboardEvent )
-throw ( RuntimeException )
+throw ( RuntimeException )
{
// Make asynchronous call to avoid locking SolarMutex which is the
// root for many deadlocks, especially in conjuction with the Windows
@@ -315,7 +315,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const
nFlags)
//=
SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
{
-SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
+SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
}
TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
@@ -345,12 +345,12 @@ static ::rtl::OUString
impl_retrieveFilterNameFromTypeAndModule(
{
::comphelper::SequenceAsHashMap aFilterPropsHM(
xEnumeration-nextElement() );
::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)),
-::rtl::OUString() );
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)),
+::rtl::OUString() );
sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Flags)),
-sal_Int32( 0 ) );
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Flags)),
+sal_Int32( 0 ) );
if ( nFilterFlags nFlags )
{
@@ -388,36 +388,36 @@ enum ETypeFamily
switch(eTypeFamily)
{
case E_MS_DOC:
- {
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.text.TextDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
writer_MS_Word_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.sheet.SpreadsheetDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
calc_MS_Excel_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.drawing.DrawingDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
impress_MS_PowerPoint_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.presentation.PresentationDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
impress_MS_PowerPoint_97 ));
- }
- break;
+{
+if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.text.TextDocument ) ))
+sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
writer_MS_Word_97 ));
+else
+if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
com.sun.star.sheet.SpreadsheetDocument ) ))
+sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
calc_MS_Excel_97 ));
+else
+if
[Libreoffice-commits] .: 2 commits - sfx2/source sw/source
sfx2/source/appl/shutdownicon.cxx |8
sw/source/ui/shells/textsh.cxx|3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 0cf0382d4eb8588c91e850adbd874c3cb5ef6f03
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Jan 21 04:42:55 2012 +0900
replaced UniString by rtl::OUString
See also d2991722b34fb597d34a3270cd4a806277c52da5
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 141aacd..ffaa63d 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -391,8 +391,8 @@ OUString ShutdownIcon::GetResString( int id )
if( !m_pResMgr || !m_pResMgr-IsAvailable( aResId ) )
return OUString();
-UniString aRes( ResId(id, *m_pResMgr) );
-return OUString( aRes );
+ResId aRes( id, *m_pResMgr );
+return ResId::toString( aRes );
}
// ---
@@ -831,8 +831,8 @@ rtl::OUString ShutdownIcon::getShortcutName()
if( pMgr )
{
::SolarMutexGuard aGuard;
-UniString aRes( SfxResId( STR_QUICKSTART_LNKNAME ) );
-aShortcutName = OUString( aRes );
+SfxResId aRes( STR_QUICKSTART_LNKNAME );
+aShortcutName = ResId::toString( aRes );
}
#ifdef WNT
aShortcutName += OUString( RTL_CONSTASCII_USTRINGPARAM( .lnk ) );
commit a06e1a6b63dfcb84cb1a3a7c5fd30829b9d33c82
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Jan 20 00:14:44 2012 +0900
It does not require SwAppletImpl but only a couple of subheaders
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 59bb69c..ef2f4b9 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -32,6 +32,8 @@
#include hintids.hxx
#include svl/globalnameitem.hxx
+#include svl/ownlist.hxx
+#include sfx2/frmdescr.hxx
#include sfx2/objface.hxx
#include sfx2/lnkbase.hxx
@@ -100,7 +102,6 @@
#include shells.hrc
#include popup.hrc
#include swerror.h
-#include SwAppletImpl.hxx
#include unochart.hxx
#include chartins.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/source ucb/source
sfx2/source/doc/sfxbasemodel.cxx | 23 +++
ucb/source/ucp/cmis/cmis_content.cxx |8 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 32d1dbdfadd0f3a3c71531c6f816568e7bd5d069
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 18 10:47:59 2011 +0200
CMIS: Fixed the smoketests failure by catching some exceptions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c335aea..cbd04f2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3771,23 +3771,30 @@ css::uno::Reference css::frame::XUntitledNumbers
SfxBaseModel::impl_getUntitl
SfxMedium* pMedium = m_pData-m_pObjectShell-GetMedium();
if ( pMedium )
{
-::ucbhelper::Content aContent( pMedium-GetName(),
com::sun::star::uno::Reference ucb::XCommandEnvironment () );
-com::sun::star::uno::Reference beans::XPropertySetInfo xProps
= aContent.getProperties();
-if ( xProps.is() )
-{
-::rtl::OUString aServerTitle(
RTL_CONSTASCII_USTRINGPARAM(TitleOnServer) );
-if ( xProps-hasPropertyByName( aServerTitle ) )
+try {
+::ucbhelper::Content aContent( pMedium-GetName(),
+uno::Referenceucb::XCommandEnvironment() );
+const uno::Reference beans::XPropertySetInfo xProps
+ = aContent.getProperties();
+if ( xProps.is() )
{
-uno::Any aAny = aContent.getPropertyValue( aServerTitle );
-aAny = aResult;
+::rtl::OUString aServerTitle(
RTL_CONSTASCII_USTRINGPARAM(TitleOnServer) );
+if ( xProps-hasPropertyByName( aServerTitle ) )
+{
+uno::Any aAny = aContent.getPropertyValue(
aServerTitle );
+aAny = aResult;
+}
}
}
-else
+catch (ucb::ContentCreationException )
+{
+}
+catch (ucb::CommandAbortedException )
{
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pRepairedDocItem,
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-if ( pRepairedDocItem pRepairedDocItem-GetValue() )
-aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
}
+SFX_ITEMSET_ARG( pMedium-GetItemSet(), pRepairedDocItem,
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
+if ( pRepairedDocItem pRepairedDocItem-GetValue() )
+aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
}
if ( m_pData-m_pObjectShell-IsReadOnlyUI() || (pMedium
pMedium-IsReadOnly()) )
commit 228051c11a5757507656460f7d28852aa9b5b540
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Tue Oct 18 08:03:11 2011 +0200
Reapply CMIS: use another name to show than the one extracted from the
base URL
This reverts commit 4901bdf4c4971e9b8235ab9bfbd0ee1088d51b45.
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 777929d..c335aea 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -55,6 +55,7 @@
#include com/sun/star/document/XStorageChangeListener.hpp
#include com/sun/star/document/XActionLockable.hpp
#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/beans/XPropertySetInfo.hpp
#include com/sun/star/container/XIndexContainer.hpp
#include com/sun/star/script/provider/XScriptProviderFactory.hpp
#include com/sun/star/script/provider/XScriptProvider.hpp
@@ -65,6 +66,7 @@
#include com/sun/star/embed/Aspects.hpp
#include com/sun/star/document/XDocumentProperties.hpp
#include com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp
+#include com/sun/star/ucb/XCommandEnvironment.hpp
#include comphelper/enumhelper.hxx // can be removed when this is a real
service
#include cppuhelper/interfacecontainer.hxx
@@ -3769,9 +3771,23 @@ css::uno::Reference css::frame::XUntitledNumbers
SfxBaseModel::impl_getUntitl
SfxMedium* pMedium = m_pData-m_pObjectShell-GetMedium();
if ( pMedium )
{
-SFX_ITEMSET_ARG( pMedium-GetItemSet(), pRepairedDocItem,
SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
-if ( pRepairedDocItem pRepairedDocItem-GetValue() )
-aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
+::ucbhelper::Content aContent( pMedium-GetName(),
com::sun::star::uno::Reference ucb::XCommandEnvironment () );
+com::sun::star::uno::Reference beans::XPropertySetInfo xProps
= aContent.getProperties();
+if ( xProps.is() )
+{
+::rtl::OUString aServerTitle(
RTL_CONSTASCII_USTRINGPARAM(TitleOnServer) );
+if ( xProps-hasPropertyByName( aServerTitle ) )
+
