[Libreoffice-commits] .: extensions/source
extensions/source/nsplugin/source/npshell.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 23b1ba968f0e092d78e98bebcfcf662b8442d711
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jan 10 09:41:49 2012 +0100
Fix npshell build on Windows.
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 76dd7a8..cdb164b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -69,7 +69,7 @@
#include boost/scoped_array.hpp
#include tools/pathutils.hxx
-#include npapi.h
+#include npsdk/npapi.h
#include npshell.hxx
#include so_env.hxx
#include so_msg.hxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII
:odp:OpenDocument Presentation;
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument
Presentation Template;
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
-SAL_DLLPUBLIC_EXPORT char*
+char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
@@ -435,7 +435,7 @@ NPP_Shutdown(void)
#endif
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_New(NPMIMEType pluginType,
NPP instance,
uint16_t mode,
@@ -487,7 +487,7 @@ NPP_New(NPMIMEType pluginType,
return NPERR_NO_ERROR;
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_Destroy(NPP instance, NPSavedData** /*save*/)
{
debug_fprintf(NSP_LOG_APPEND, print by Nsplugin, enter NPP_Destroy.\n);
@@ -532,7 +532,7 @@ NPP_Destroy(NPP instance, NPSavedData** /*save*/)
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_SetWindow(NPP instance, NPWindow* window)
{
PluginInstance* This;
@@ -626,7 +626,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_NewStream(NPP instance,
NPMIMEType /*type*/,
NPStream* /*stream*/,
@@ -648,21 +648,21 @@ int32_t STREAMBUFSIZE = 0X0FFF;
* mode so we can take any size stream in our
* write call (since we ignore it) */
-SAL_DLLPUBLIC_EXPORT int32_t
+int32_t NP_LOADDS
NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/)
{
return STREAMBUFSIZE;
}
-SAL_DLLPUBLIC_EXPORT int32_t
+int32_t NP_LOADDS
NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t
len, void* /*buffer*/)
{
return len; /* The number of bytes accepted */
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
{
if (instance == NULL)
@@ -671,7 +671,7 @@ NPP_DestroyStream(NPP instance, NPStream* /*stream*/,
NPError /*reason*/)
}
// save fname to another file with the original file name
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
{
debug_fprintf(NSP_LOG_APPEND, Into Stream\n);
@@ -812,14 +812,14 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const
char* fname)
debug_fprintf(NSP_LOG_APPEND, NPP_StreamAsFile send SO_SET_WINDOW
return failure \n);
}
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_URLNotify(NPP /*instance*/, const char* /*url*/,
NPReason /*reason*/, void* /*notifyData*/)
{
}
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_Print(NPP instance, NPPrint* printInfo)
{
if(printInfo == NULL)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - editeng/source extensions/Library_pl.mk extensions/source
editeng/source/editeng/edtspell.cxx | 46 ++-
extensions/Library_pl.mk |4 +-
extensions/source/plugin/aqua/sysplug.mm | 19 +--
extensions/source/plugin/base/xplugin.cxx|2 -
extensions/source/plugin/inc/plugin/impl.hxx |6 ---
extensions/source/plugin/unx/nppapi.cxx |4 +-
6 files changed, 57 insertions(+), 24 deletions(-)
New commits:
commit 2af8b95af8730fc68ad6fcd3eaab38a799eef580
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 10:37:56 2012 +0100
editeng: fix STL conversion dfbf0cabfa8310502e19642d56c746cc0d454d27
- iterators should be compared with !=, not
- iterator invalidation on erase should be avoided by using the
iterator that is returned by erase
- in WrongList::operator== only one iterator was incremented
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index a356257..77a65dd 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -242,7 +242,7 @@ void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16
nNew, sal_Bool bPosIsS
nInvalidEnd = nPos+nNew;
}
-for (WrongList::iterator i = begin(); i end(); ++i)
+for (WrongList::iterator i = begin(); i != end(); ++i)
{
sal_Bool bRefIsValid = sal_True;
if (i-nEnd = nPos)
@@ -312,7 +312,7 @@ void WrongList::TextDeleted( sal_uInt16 nPos, sal_uInt16
nDeleted )
}
}
-for (WrongList::reverse_iterator i = rbegin(); i rend(); ++i)
+for (WrongList::iterator i = begin(); i != end(); )
{
sal_Bool bDelWrong = sal_False;
if (i-nEnd = nPos)
@@ -345,7 +345,13 @@ void WrongList::TextDeleted( sal_uInt16 nPos, sal_uInt16
nDeleted )
}
DBG_ASSERT(i-nStart i-nEnd, TextInserted, WrongRange: Start =
End?! );
if ( bDelWrong )
-erase(--(i.base()));
+{
+i = erase(i);
+}
+else
+{
+++i;
+}
}
DBG_ASSERT( !DbgIsBuggy(), InsertWrong: WrongList broken! );
@@ -357,7 +363,7 @@ sal_Bool WrongList::NextWrong( sal_uInt16 rnStart,
sal_uInt16 rnEnd ) const
rnStart get the start position, is possibly adjusted wrt. Wrong start
rnEnd does not have to be initialized.
*/
-for (WrongList::const_iterator i = begin(); i end(); ++i)
+for (WrongList::const_iterator i = begin(); i != end(); ++i)
{
if ( i-nEnd rnStart )
{
@@ -371,7 +377,7 @@ sal_Bool WrongList::NextWrong( sal_uInt16 rnStart,
sal_uInt16 rnEnd ) const
sal_Bool WrongList::HasWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
{
-for (WrongList::const_iterator i = begin(); i end(); ++i)
+for (WrongList::const_iterator i = begin(); i != end(); ++i)
{
if (i-nStart == nStart i-nEnd == nEnd)
return sal_True;
@@ -383,7 +389,7 @@ sal_Bool WrongList::HasWrong( sal_uInt16 nStart, sal_uInt16
nEnd ) const
sal_Bool WrongList::HasAnyWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
{
-for (WrongList::const_iterator i = begin(); i end(); ++i)
+for (WrongList::const_iterator i = begin(); i != end(); ++i)
{
if (i-nEnd = nStart i-nStart nEnd)
return sal_True;
@@ -396,7 +402,7 @@ sal_Bool WrongList::HasAnyWrong( sal_uInt16 nStart,
sal_uInt16 nEnd ) const
void WrongList::ClearWrongs( sal_uInt16 nStart, sal_uInt16 nEnd,
const ContentNode* pNode )
{
-for (WrongList::reverse_iterator i = rbegin(); i rend(); ++i)
+for (WrongList::iterator i = begin(); i != end(); )
{
if (i-nEnd nStart i-nStart nEnd)
{
@@ -407,10 +413,20 @@ void WrongList::ClearWrongs( sal_uInt16 nStart,
sal_uInt16 nEnd,
while (i-nStart pNode-Len()
(pNode-GetChar(i-nStart) == ' ' ||
pNode-IsFeature(i-nStart)))
+{
++(i-nStart);
+}
+++i;
}
else
-erase(--(i.base()));
+{
+i = erase(i);
+// no increment here
+}
+}
+else
+{
+++i;
}
}
@@ -421,7 +437,7 @@ void WrongList::InsertWrong( sal_uInt16 nStart, sal_uInt16
nEnd,
sal_Bool bClearRange )
{
WrongList::iterator nPos = end();
-for (WrongList::iterator i = begin(); i end(); ++i)
+for (WrongList::iterator i = begin(); i != end(); ++i)
{
if (i-nStart = nStart )
{
@@ -440,7 +456,7 @@ void WrongList::InsertWrong( sal_uInt16 nStart, sal_uInt16
nEnd,
}
}
-if(nPos end())
+if (nPos != end())
insert(nPos, WrongRange(nStart, nEnd));
else
push_back(WrongRange(nStart, nEnd));
@@ -458,7 +474,7 @@ WrongList* WrongList::Clone() const
{
WrongList* pNew = new
[Libreoffice-commits] .: 2 commits - basctl/uiconfig default_images/cmd officecfg/registry ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen sv
basctl/uiconfig/basicide/toolbar/formcontrolsbar.xml | 15 -- default_images/cmd/lc_insertformcheck.png |binary default_images/cmd/lc_insertformcombo.png |binary default_images/cmd/lc_insertformhscroll.png |binary default_images/cmd/lc_insertformlist.png |binary default_images/cmd/lc_insertformradio.png |binary default_images/cmd/lc_insertformspin.png |binary default_images/cmd/lc_insertformvscroll.png |binary default_images/cmd/sc_insertformcheck.png |binary default_images/cmd/sc_insertformcombo.png |binary default_images/cmd/sc_insertformhscroll.png |binary default_images/cmd/sc_insertformlist.png |binary default_images/cmd/sc_insertformradio.png |binary default_images/cmd/sc_insertformspin.png |binary default_images/cmd/sc_insertformvscroll.png |binary officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu | 14 - ooo_custom_images/hicontrast/cmd/lc_insertformcheck.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformcombo.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformhscroll.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformlist.png|binary ooo_custom_images/hicontrast/cmd/lc_insertformradio.png |binary ooo_custom_images/hicontrast/cmd/lc_insertformspin.png|binary ooo_custom_images/hicontrast/cmd/lc_insertformvscroll.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformcheck.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformcombo.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformhscroll.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformlist.png|binary ooo_custom_images/hicontrast/cmd/sc_insertformradio.png |binary ooo_custom_images/hicontrast/cmd/sc_insertformspin.png|binary ooo_custom_images/hicontrast/cmd/sc_insertformvscroll.png |binary ooo_custom_images/human/cmd/lc_insertformcheck.png|binary ooo_custom_images/human/cmd/lc_insertformcombo.png|binary ooo_custom_images/human/cmd/lc_insertformhscroll.png |binary ooo_custom_images/human/cmd/lc_insertformlist.png |binary ooo_custom_images/human/cmd/lc_insertformradio.png|binary ooo_custom_images/human/cmd/lc_insertformspin.png |binary ooo_custom_images/human/cmd/lc_insertformvscroll.png |binary ooo_custom_images/human/cmd/sc_insertformcheck.png|binary ooo_custom_images/human/cmd/sc_insertformcombo.png|binary ooo_custom_images/human/cmd/sc_insertformhscroll.png |binary ooo_custom_images/human/cmd/sc_insertformlist.png |binary ooo_custom_images/human/cmd/sc_insertformradio.png|binary ooo_custom_images/human/cmd/sc_insertformspin.png |binary ooo_custom_images/human/cmd/sc_insertformvscroll.png |binary ooo_custom_images/industrial/cmd/lc_insertformcheck.png |binary ooo_custom_images/industrial/cmd/lc_insertformcombo.png |binary ooo_custom_images/industrial/cmd/lc_insertformhscroll.png |binary ooo_custom_images/industrial/cmd/lc_insertformlist.png|binary ooo_custom_images/industrial/cmd/lc_insertformradio.png |binary ooo_custom_images/industrial/cmd/lc_insertformvscroll.png |binary ooo_custom_images/industrial/cmd/sc_insertformcheck.png |binary ooo_custom_images/industrial/cmd/sc_insertformcombo.png |binary ooo_custom_images/industrial/cmd/sc_insertformhscroll.png |binary ooo_custom_images/industrial/cmd/sc_insertformlist.png|binary ooo_custom_images/industrial/cmd/sc_insertformradio.png |binary ooo_custom_images/industrial/cmd/sc_insertformvscroll.png |binary ooo_custom_images/oxygen/cmd/lc_insertformcheck.png |binary ooo_custom_images/oxygen/cmd/lc_insertformcombo.png |binary ooo_custom_images/oxygen/cmd/lc_insertformhscroll.png |binary ooo_custom_images/oxygen/cmd/lc_insertformlist.png|binary ooo_custom_images/oxygen/cmd/lc_insertformradio.png |binary ooo_custom_images/oxygen/cmd/lc_insertformspin.png|binary ooo_custom_images/oxygen/cmd/lc_insertformvscroll.png |binary
[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
binfilter/bf_basic/source/basmgr/basmgr.cxx |2
binfilter/bf_sc/source/core/data/sc_globalx.cxx |2
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx |4
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx| 58 -
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx|8 -
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx|2
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 12 -
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |4
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 67 ---
binfilter/bf_svx/source/svxlink/svx_fileobj.cxx |2
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx |2
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx |2
binfilter/inc/bf_sfx2/docfile.hxx|4
binfilter/inc/bf_svtools/pathoptions.hxx |2
14 files changed, 55 insertions(+), 116 deletions(-)
New commits:
commit edf439f6016fa8ab7ba7267c49cde32e201d8b06
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 22:36:26 2012 +
force users of horrific ReadUniOrByteStringLine to provide the charset
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index 66fa779..3d6d3b4 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -472,13 +472,13 @@ enum DoubledQuoteMode
/*N*/
/*N*/ while(--nSkipLines0)
/*N*/ {
-/*?*/ rStrm.ReadUniOrByteStringLine( aLine ); // content is ignored
+/*?*/ rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
// content is ignored
/*?*/ if ( rStrm.IsEof() )
/*?*/ break;
/*N*/ }
/*N*/ for( ;; )
/*N*/ {
-/*N*/ rStrm.ReadUniOrByteStringLine( aLine );
+/*N*/ rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
/*N*/ if ( rStrm.IsEof() )
/*N*/ break;
/*N*/
commit 24e7ea4126d944958966cd9421089bc4aa76c17e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 9 21:06:04 2012 +
adapt to simplified LocalFileHelper::ConvertURLToPhysicalName
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx
b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index c551b55..efda967 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -977,7 +977,7 @@ void BasicManager::LoadBasicManager( SotStorage rStorage,
const String rBaseUR
if ( pLibs-aBasicLibPath.Len() )
{
// Lib im Pfad suchen...
-String aSearchFile = pInfo-GetRelStorageName();
+rtl::OUString aSearchFile = pInfo-GetRelStorageName();
SvtPathOptions aPathCFG;
if( aPathCFG.SearchFile( aSearchFile,
SvtPathOptions::PATH_BASIC ) )
{
diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
index c7c06ca..9f8642c 100644
--- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
@@ -70,7 +70,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // use LocalFileHelper to convert the path to a URL that
always points
/*N*/ // to the file on the server
-/*N*/ String aUrl;
+/*N*/ rtl::OUString aUrl;
/*N*/ if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL(
aPath, aUrl ) )
/*N*/ aPath = aUrl;
/*N*/
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 2bf7615..10b509c 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -466,12 +466,12 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ String aURL;
-/*N*/ if ( aName.Len() )
+/*N*/ rtl::OUString aURL;
+/*N*/ if ( !aName.isEmpty() )
/*N*/ ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName,
aURL );
/*N*/ else if ( aLogicName.Len() )
/*N*/ aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE
);
-/*N*/ if ( aURL.Len() )
+/*N*/ if ( !aURL.isEmpty() )
/*N*/ ::ucbhelper::Content::create( aURL, xEnv, pImp-aContent );
/*N*/ }
/*N*/ }
@@ -609,9 +609,9 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
/*N*/ }
//--
-/*N*/ const String SfxMedium::GetPhysicalName() const
+/*N*/ const rtl::OUString SfxMedium::GetPhysicalName() const
/*N*/ {
-/*N*/ if ( !aName.Len() aLogicName.Len() )
+/*N*/ if ( aName.isEmpty() aLogicName.Len() )
/*N*/ ((
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 8 commits - sw/inc sw/source
sw/inc/crsrsh.hxx |1
sw/inc/viewsh.hxx | 21 +++-
sw/source/core/crsr/crsrsh.cxx | 23 +++-
sw/source/core/inc/pagefrm.hxx |5 -
sw/source/core/layout/pagechg.cxx | 22 +++-
sw/source/core/layout/paintfrm.cxx | 47 +
sw/source/core/view/viewsh.cxx | 21 +++-
sw/source/core/view/vnew.cxx|9 +
sw/source/ui/docvw/FrameControlsManager.cxx |9 +
sw/source/ui/docvw/HeaderFooterWin.cxx | 19 +++-
sw/source/ui/docvw/PageBreakWin.cxx | 132 +++-
sw/source/ui/docvw/edtwin.cxx | 121 +
sw/source/ui/inc/FrameControl.hxx |4
sw/source/ui/inc/FrameControlsManager.hxx | 11 --
sw/source/ui/inc/HeaderFooterWin.hxx|3
sw/source/ui/inc/PageBreakWin.hxx |7 +
sw/source/ui/inc/edtwin.hxx | 14 +-
sw/source/ui/inc/wrtsh.hxx |2
sw/source/ui/wrtsh/wrtsh1.cxx |6 -
19 files changed, 267 insertions(+), 210 deletions(-)
New commits:
commit 6e3d9d601cf7a9f20a93eb8fc9abf5d8464eec28
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 5 11:34:49 2012 +0100
Page Break: center the tab on the mouse and remove click on the line
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index b16e51f..f954b6e 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -125,7 +125,6 @@ namespace
m_pWin( pWin ) {};
virtual void MouseMove( const MouseEvent rMEvt );
-virtual void MouseButtonDown( const MouseEvent rMEvt );
};
void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
@@ -148,16 +147,6 @@ namespace
m_pWin-UpdatePosition( pPtr );
}
}
-
-void SwBreakDashedLine::MouseButtonDown( const MouseEvent rMEvt )
-{
-sal_uInt16 nItemId = m_pWin-GetPopupMenu()-Execute( this,
rMEvt.GetPosPixel() );
-if ( nItemId )
-{
-m_pWin-SetCurItemId( nItemId );
-m_pWin-Select();
-}
-}
}
SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm
) :
@@ -452,14 +441,10 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
if ( m_pMousePt )
{
-nBtnLeft = nLineLeft + m_pMousePt-X();
+nBtnLeft = nLineLeft + m_pMousePt-X() - aBtnSize.getWidth() / 2;
-if ( Application::GetSettings().GetLayoutRTL() )
-{
-nBtnLeft -= aBtnSize.getWidth();
-if ( nBtnLeft nLineLeft )
-nBtnLeft = nLineLeft;
-}
+if ( nBtnLeft nLineLeft )
+nBtnLeft = nLineLeft;
else if ( ( nBtnLeft + aBtnSize.getWidth() ) nLineRight )
nBtnLeft = nLineRight - aBtnSize.getWidth();
}
commit c17724737cc54fbecb32c510c437c4fda045d94b
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Jan 4 21:54:05 2012 +0100
Page Break: fixed position of tab in RTL and added dirty hack for freezes
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index aa1085c..b16e51f 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -142,8 +142,11 @@ namespace
m_pWin-Fade( true );
}
-Point* pPtr = new Point( rMEvt.GetPosPixel() );
-m_pWin-UpdatePosition( pPtr );
+if ( !rMEvt.IsSynthetic() )
+{
+Point* pPtr = new Point( rMEvt.GetPosPixel() );
+m_pWin-UpdatePosition( pPtr );
+}
}
void SwBreakDashedLine::MouseButtonDown( const MouseEvent rMEvt )
@@ -450,7 +453,14 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
if ( m_pMousePt )
{
nBtnLeft = nLineLeft + m_pMousePt-X();
-if ( ( nBtnLeft + aBtnSize.getWidth() ) nLineRight )
+
+if ( Application::GetSettings().GetLayoutRTL() )
+{
+nBtnLeft -= aBtnSize.getWidth();
+if ( nBtnLeft nLineLeft )
+nBtnLeft = nLineLeft;
+}
+else if ( ( nBtnLeft + aBtnSize.getWidth() ) nLineRight )
nBtnLeft = nLineRight - aBtnSize.getWidth();
}
commit a0347a9b94e2dc4ee1906341aa187d6a9f7749af
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Wed Jan 4 09:33:44 2012 +0100
Page Break: show the page break right under the mouse
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 94b314c..aa1085c 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -68,59 +68,22 @@ using namespace drawinglayer::primitive2d;
namespace
{
-static B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds, bool bMirror )
+static B2DPolygon lcl_CreatePolygon(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sw/source
sw/source/ui/docvw/HeaderFooterWin.cxx | 14 +++-
sw/source/ui/docvw/PageBreakWin.cxx| 108 ++---
sw/source/ui/inc/HeaderFooterWin.hxx |1
sw/source/ui/inc/PageBreakWin.hxx |3
4 files changed, 37 insertions(+), 89 deletions(-)
New commits:
commit 1e0de54d88a79c99f0671f608f7de096cb721537
Author: Jan Holesovsky ke...@suse.cz
Date: Sat Jan 7 04:27:25 2012 +0100
Page Breaks: IsLeaveWindow() is unreliable, we do not need it here.
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0edeb61..ff5050b 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -83,17 +83,11 @@ namespace
void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
{
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'button'
-Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin-Contains( aEventPos ) )
-m_pWin-Fade( false );
-}
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !m_pWin-Contains( aEventPos ) )
+m_pWin-Fade( false );
else if ( !m_pWin-IsVisible() )
-{
m_pWin-Fade( true );
-}
if ( !rMEvt.IsSynthetic() )
{
@@ -309,13 +303,9 @@ void SwPageBreakWin::Select( )
void SwPageBreakWin::MouseMove( const MouseEvent rMEvt )
{
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'line', or the popup menu is open
-Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !Contains( aEventPos ) !PopupMenu::IsInExecute() )
-Fade( false );
-}
+Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !Contains( aEventPos ) !PopupMenu::IsInExecute() )
+Fade( false );
else if ( !IsVisible() )
Fade( true );
}
commit a5f59c3802199f01dfbce70b01183d4d0166c2f2
Author: Jan Holesovsky ke...@suse.cz
Date: Sat Jan 7 04:16:44 2012 +0100
Header/Footer, Page Breaks: Delay appearing by 500ms.
The delay was a good idea, just the 1s was too long.
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index ff7d50e..330c1ff 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -153,6 +153,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin,
const SwPageFrm* pPag
m_pLine( NULL ),
m_bIsAppearing( false ),
m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
m_aFadeTimer( )
{
// Get the font and configure it
@@ -243,6 +244,9 @@ void SwHeaderFooterWin::ShowAll( bool bShow )
if ( !PopupMenu::IsInExecute() )
{
m_bIsAppearing = bShow;
+if ( bShow )
+m_nDelayAppearing = 0;
+
if ( m_aFadeTimer.IsActive( ) )
m_aFadeTimer.Stop();
m_aFadeTimer.Start( );
@@ -516,6 +520,14 @@ void SwHeaderFooterWin::Select( )
IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, EMPTYARG )
{
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing m_nDelayAppearing TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
if ( m_bIsAppearing m_nFadeRate 0 )
m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
@@ -535,7 +547,7 @@ IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *,
EMPTYARG )
Invalidate();
if ( IsVisible( ) m_nFadeRate 0 m_nFadeRate 100 )
-m_aFadeTimer.Start();
+m_aFadeTimer.Start();
return 0;
}
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0617101..0edeb61 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -110,6 +110,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const
SwPageFrm* pPageFrm )
m_pLine( NULL ),
m_bIsAppearing( false ),
m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
m_bDestroyed( false ),
m_pMousePt( NULL )
{
@@ -424,6 +425,9 @@ void SwPageBreakWin::SetReadonly( bool bReadonly )
void SwPageBreakWin::Fade( bool bFadeIn )
{
m_bIsAppearing = bFadeIn;
+if ( bFadeIn )
+m_nDelayAppearing = 0;
+
if ( !m_bDestroyed m_aFadeTimer.IsActive( ) )
m_aFadeTimer.Stop();
if ( !m_bDestroyed )
@@ -439,6 +443,14 @@ IMPL_LINK( SwPageBreakWin, HideHandler, void *, EMPTYARG )
IMPL_LINK( SwPageBreakWin, FadeHandler, Timer *, EMPTYARG )
{
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing m_nDelayAppearing TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
if ( m_bIsAppearing m_nFadeRate 0 )
m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
diff --git
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/doc/docnew.cxx | 173 ++--
sw/source/core/doc/docnum.cxx | 198 --
2 files changed, 183 insertions(+), 188 deletions(-)
New commits:
commit d93196c815c77e9612423ceb81d4b39b79407e35
Author: Philipp Weissenbacher Philipp Weissenbacher
Date: Sun Jan 8 22:38:04 2012 +0100
Translate German comments and correct a few English ones
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index d5a609a..baa798d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -120,8 +120,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule rRule )
// assure that the outline numbering rule is an automatic rule
pOutlineRule-SetAutoRule( sal_True );
-// teste ob die evt. gesetzen CharFormate in diesem Document
-// definiert sind
+// test whether the optional CharFormats are defined in this Document
pOutlineRule-CheckCharFmts( this );
// notify text nodes, which are registered at the outline style, about the
@@ -146,7 +145,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule rRule )
pOutlineRule-SetInvalidRule(sal_True);
UpdateNumRule();
-// gibt es Fussnoten gilt Kapitelweises Nummerieren, dann updaten
+// update if we have foot notes chapter-wise numbering
if( GetFtnIdxs().Count() FTNNUM_CHAPTER == GetFtnInfo().eNum )
GetFtnIdxs().UpdateAllFtn();
@@ -182,13 +181,13 @@ void SwDoc::PropagateOutlineRule()
}
}
-// Hoch-/Runterstufen
+// Increase/Decrease
sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short nOffset )
{
if( !GetNodes().GetOutLineNds().Count() || !nOffset )
return sal_False;
-// den Bereich feststellen
+// calculate the area
const SwOutlineNodes rOutlNds = GetNodes().GetOutLineNds();
const SwNodePtr pSttNd = (SwNodePtr)rPam.Start()-nNode.GetNode();
const SwNodePtr pEndNd = (SwNodePtr)rPam.End()-nNode.GetNode();
@@ -196,19 +195,19 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
if( !rOutlNds.Seek_Entry( pSttNd, nSttPos )
!nSttPos-- )
-// wir stehen in keiner Outline-Section
+// we're not in an Outline section
return sal_False;
if( rOutlNds.Seek_Entry( pEndNd, nEndPos ) )
++nEndPos;
-// jetzt haben wir unseren Bereich im OutlineNodes-Array
-// dann prufe ersmal, ob nicht unterebenen aufgehoben werden
-// (Stufung ueber die Grenzen)
+// We now have the wanted area in the OutlineNodes array,
+// so check now if we're not invalidating sublevels
+// (stepping over the limits)
sal_uInt16 n;
-// so, dann koennen wir:
-// 1. Vorlagen-Array anlegen
+// Here we go:
+// 1. Create the Template array:
SwTxtFmtColl* aCollArr[ MAXLEVEL ];
memset( aCollArr, 0, sizeof( SwTxtFmtColl* ) * MAXLEVEL );
@@ -282,13 +281,11 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
/* -- #i13747#
- Build a move table that states from which level an outline will
+Build a move table that states from which level to which other level
+an outline will be moved.
- be moved to which other level. */
-
-/* the move table
-
- aMoveArr[n] = m: replace aCollArr[n] with aCollArr[m]
+the move table:
+aMoveArr[n] = m: replace aCollArr[n] with aCollArr[m]
*/
int aMoveArr[MAXLEVEL];
int nStep; // step size for searching in aCollArr: -1 or 1
@@ -380,7 +377,7 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
GetIDocumentUndoRedo().AppendUndo(pUndoOLR);
}
-// 2. allen Nodes die neue Vorlage zuweisen
+// 2. Apply the new Template to all Nodes
n = nSttPos;
while( n nEndPos)
@@ -427,10 +424,10 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
return sal_True;
}
-// Hoch-/Runter - Verschieben !
+// Move up/down
sal_Bool SwDoc::MoveOutlinePara( const SwPaM rPam, short nOffset )
{
-// kein Verschiebung in den Sonderbereichen
+// Do not move to special areas
const SwPosition rStt = *rPam.Start(),
rEnd = rStt == rPam.GetPoint() ? *rPam.GetMark()
: *rPam.GetPoint();
@@ -564,12 +561,12 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM rPam, short
nOffset )
return sal_False;
OSL_ENSURE( aSttRg.GetIndex() nNewPos || nNewPos = aEndRg.GetIndex(),
-Position liegt im MoveBereich );
+Position lies within MoveArea );
-// wurde ein Position in den Sonderbereichen errechnet, dann
-// setze die Position auf den Dokumentanfang.
-// Sollten da Bereiche oder Tabellen stehen, so werden sie nach
-// hinten verschoben.
+// If a Position was calculated for the special area, we set it
+// to document start instead.
+// Areas or Tables at the document start
[Libreoffice-commits] .: sd/source
sd/source/core/stlpool.cxx | 28 +++-
1 file changed, 15 insertions(+), 13 deletions(-)
New commits:
commit 897aa4fa71813ca188b0e1e01ca41ca1e35d415d
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 10 11:42:11 2012 +0100
Tools container rework regression fix (for fdo#41657)
Don't de-reference invalid iterator (and no point in doing anything
with an empty style sheet list anyway).
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index f6ee1bd..3625bbf 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -681,24 +681,26 @@ void SdStyleSheetPool::CopyLayoutSheets(const String
rLayoutName, SdStyleSheetP
std::vectorSfxStyleSheetBase* aOutlineSheets;
CreateOutlineSheetList(rLayoutName,aOutlineSheets);
-std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
-
-SfxStyleSheetBase* pParent = *it;
-++it;
-
-while (it != aOutlineSheets.end())
+if( !aOutlineSheets.empty() )
{
-pSheet = *it;
+std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
+SfxStyleSheetBase* pParent = *it;
+++it;
-if (!pSheet)
-break;
+while (it != aOutlineSheets.end())
+{
+pSheet = *it;
-if (pSheet-GetParent().Len() == 0)
-pSheet-SetParent(pParent-GetName());
+if (!pSheet)
+break;
-pParent = pSheet;
+if (pSheet-GetParent().Len() == 0)
+pSheet-SetParent(pParent-GetName());
-++it;
+pParent = pSheet;
+
+++it;
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - canvas/source sd/source slideshow/source
canvas/source/directx/dx_impltools.cxx |4 -
canvas/source/tools/spriteredrawmanager.cxx | 31 +--
canvas/source/vcl/textlayout.cxx |4 -
sd/source/core/stlpool.cxx | 28 +
slideshow/source/engine/animationnodes/basecontainernode.cxx |3 -
slideshow/source/engine/eventmultiplexer.cxx |4 -
slideshow/source/engine/tools.cxx|2
7 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 0585c2f892db7c7e3aa454b79768e34703b15186
Author: julien2412 serval2...@yahoo.fr
Date: Mon Jan 9 18:03:11 2012 +0100
Fix crash when play particular presentation with sound
This fixes fdo#44533.
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index 991452f..2af5b34 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -271,18 +271,18 @@ namespace canvas
++aCurrRecord;
}
-VectorOfSprites::iterator aBegin( aUpdatableSprites.begin() );
-VectorOfSprites::iterator aEnd ( aUpdatableSprites.end() );
-::std::sort( aBegin,
- aEnd,
+::std::sort( aUpdatableSprites.begin(),
+ aUpdatableSprites.end(),
aSpriteComparator );
-aEnd = ::std::unique( aBegin, aEnd );
+VectorOfSprites::iterator aEnd=
+::std::unique( aUpdatableSprites.begin(),
+ aUpdatableSprites.end() );
// for each unique sprite, check the change event vector,
// calculate the update operation from that, and add the
// result to the aUpdateArea.
-::std::for_each( aBegin,
+::std::for_each( aUpdatableSprites.begin(),
aEnd,
SpriteUpdater( rUpdateAreas,
maChangeRecords) );
@@ -298,7 +298,8 @@ namespace canvas
VectorOfSprites aUnchangedSprites;
::std::set_difference( aSortedSpriteVector.begin(),
aSortedSpriteVector.end(),
- aBegin, aEnd,
+ aUpdatableSprites.begin(),
+ aEnd,
::std::back_insert_iterator VectorOfSprites
(aUnchangedSprites) );
// add each remaining unchanged sprite to connected ranges,
commit 334bbec9d40eec73fd67652210a67f90966a360b
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Jan 10 11:42:11 2012 +0100
Tools container rework regression fix (for fdo#41657)
Don't de-reference invalid iterator (and no point in doing anything
with an empty style sheet list anyway).
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index f6ee1bd..3625bbf 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -681,24 +681,26 @@ void SdStyleSheetPool::CopyLayoutSheets(const String
rLayoutName, SdStyleSheetP
std::vectorSfxStyleSheetBase* aOutlineSheets;
CreateOutlineSheetList(rLayoutName,aOutlineSheets);
-std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
-
-SfxStyleSheetBase* pParent = *it;
-++it;
-
-while (it != aOutlineSheets.end())
+if( !aOutlineSheets.empty() )
{
-pSheet = *it;
+std::vectorSfxStyleSheetBase*::iterator it = aOutlineSheets.begin();
+SfxStyleSheetBase* pParent = *it;
+++it;
-if (!pSheet)
-break;
+while (it != aOutlineSheets.end())
+{
+pSheet = *it;
-if (pSheet-GetParent().Len() == 0)
-pSheet-SetParent(pParent-GetName());
+if (!pSheet)
+break;
-pParent = pSheet;
+if (pSheet-GetParent().Len() == 0)
+pSheet-SetParent(pParent-GetName());
-++it;
+pParent = pSheet;
+
+++it;
+}
}
}
commit 46daad95f8b65b91a0a30bda451dceff05408ecd
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Jan 9 18:35:27 2012 +0100
Avoid pointless const_cast, use getConstArray in all cases.
Another code-review follow-up fix from fdo#44533 - don't use
Sequence::getArray, that tends to create a new copy everytime you
call.
diff --git a/canvas/source/directx/dx_impltools.cxx
b/canvas/source/directx/dx_impltools.cxx
index 946a9b2..63bcabe 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -452,8 +452,8 @@ namespace dxcanvas
// TODO(F1): Closed/open polygons
// convert from RealPoint2D array to Gdiplus::PointF array
-::std::transform( const_cast uno::Sequence
geometry::RealPoint2D (points[nCurrPoly]).getArray(),
-
[Libreoffice-commits] .: sw/source
sw/source/filter/html/swhtml.cxx |4
sw/source/ui/index/cnttab.cxx|4
2 files changed, 8 deletions(-)
New commits:
commit 322afee279afd6ce5a99212757d0747858959d80
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 11:38:42 2012 +
MAC_WITHOUT_EXT never defined thesedays
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 019c9dd..23cc0df 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -165,16 +165,13 @@ String HTMLReader::GetTemplateName() const
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(html) );
String sTemplateWithoutExt( sTemplate );
-#ifndef MAC_WITHOUT_EXT
// first search for OpenDocument Writer/Web template
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(.oth) );
-#endif
SvtPathOptions aPathOpt;
// OpenDocument Writer/Web template (extension .oth)
sal_Bool bSet = aPathOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
-#ifndef MAC_WITHOUT_EXT
if( !bSet )
{
// 6.0 (extension .stw)
@@ -184,7 +181,6 @@ String HTMLReader::GetTemplateName() const
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(.stw) );
bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
}
-#endif
if( !bSet )
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 59382cb..414bc5f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -513,15 +513,12 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox
*, pBox )
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(idxexample) );
String sTemplateWithoutExt( sTemplate );
-#ifndef MAC_WITHOUT_EXT
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(.odt) );
-#endif
SvtPathOptions aOpt;
// 6.0 (extension .sxw)
sal_Bool bExist = aOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
-#ifndef MAC_WITHOUT_EXT
if( !bExist )
{
// 6.0 (extension .sxw)
@@ -536,7 +533,6 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *,
pBox )
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM(.sdw) );
bExist = aOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
}
-#endif
if(!bExist)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: store/source
store/source/lockbyte.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e596df57b54bcb4f67dfa1242d47dda0f1e0f6aa
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 12:36:03 2012 +
valgrind: have MappedLockBytes take complete ownership of the file handle
have MappedLockBytes take complete ownership of the file handle and
unmap it and close it on release. Otherwise xFile will close it
and MappedLockBytes will unmap it in that order, which breaks
post android requirement to have a valid file handle in unmap
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index a91e470..e28bffe 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -509,6 +509,7 @@ struct FileMapping
static void unmapFile (oslFileHandle hFile, sal_uInt8 * pAddr, sal_uInt32
nSize)
{
(void) osl_unmapMappedFile (hFile, pAddr, nSize);
+(void) osl_closeFile (hFile);
}
/** @see ResourceHolderT::destructor_type
@@ -922,6 +923,7 @@ FileLockBytes_createInstance (
rxLockBytes = new MappedLockBytes (xMapping.get());
if (!rxLockBytes.is())
return store_E_OutOfMemory;
+(void) xFile.release();
(void) xMapping.release();
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/source
oox/source/drawingml/customshapegeometry.cxx | 11 ++--
oox/source/drawingml/customshapepresets1.cxx | 22 +++--
oox/source/drawingml/customshapepresets2.cxx | 22 +++--
oox/source/drawingml/customshapepresets3.cxx | 22 +++--
oox/source/drawingml/customshapepresets5.cxx | 66 +--
5 files changed, 55 insertions(+), 88 deletions(-)
New commits:
commit d0521e28a12e6fbba70d6d866ba37fb6565701f9
Author: Radek Doulik r...@novell.com
Date: Tue Jan 10 13:09:51 2012 +0100
pptx: regenerate presets after custom shapes moveto/close fix
diff --git a/oox/source/drawingml/customshapepresets1.cxx
b/oox/source/drawingml/customshapepresets1.cxx
index d0b5c42..4013557 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -12524,7 +12524,7 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
aPropSequence [1].Name = CREATE_OUSTRING (Segments);
-Sequence EnhancedCustomShapeSegment aSegmentSeq (13);
+Sequence EnhancedCustomShapeSegment aSegmentSeq (12);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -12557,51 +12557,45 @@ void CustomShapeProperties::initializePresetsMap1()
}
{
EnhancedCustomShapeSegment aSegment;
-aSegment.Command = 4;
-aSegment.Count = 0;
-aSegmentSeq [5] = aSegment;
-}
-{
-EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
-aSegmentSeq [6] = aSegment;
+aSegmentSeq [5] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
-aSegmentSeq [7] = aSegment;
+aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
-aSegmentSeq [8] = aSegment;
+aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
aSegment.Count = 1;
-aSegmentSeq [9] = aSegment;
+aSegmentSeq [8] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
-aSegmentSeq [10] = aSegment;
+aSegmentSeq [9] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
-aSegmentSeq [11] = aSegment;
+aSegmentSeq [10] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
-aSegmentSeq [12] = aSegment;
+aSegmentSeq [11] = aSegment;
}
aPropSequence [1].Value = makeAny (aSegmentSeq);
}
diff --git a/oox/source/drawingml/customshapepresets2.cxx
b/oox/source/drawingml/customshapepresets2.cxx
index 9cccf75..8f6a98b 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -16609,7 +16609,7 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
aPropSequence [1].Name = CREATE_OUSTRING (Segments);
-Sequence EnhancedCustomShapeSegment aSegmentSeq (14);
+Sequence EnhancedCustomShapeSegment aSegmentSeq (13);
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 1;
@@ -16648,51 +16648,45 @@ void CustomShapeProperties::initializePresetsMap2()
}
{
EnhancedCustomShapeSegment aSegment;
-aSegment.Command = 4;
-aSegment.Count = 0;
-aSegmentSeq [6] = aSegment;
-}
-{
-EnhancedCustomShapeSegment aSegment;
aSegment.Command = 2;
aSegment.Count = 1;
-aSegmentSeq [7] = aSegment;
+aSegmentSeq [6] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 6;
aSegment.Count = 0;
-aSegmentSeq [8] = aSegment;
+aSegmentSeq [7] = aSegment;
}
{
EnhancedCustomShapeSegment aSegment;
aSegment.Command = 5;
aSegment.Count = 0;
-aSegmentSeq [9] = aSegment;
+
[Libreoffice-commits] .: framework/source
framework/source/uielement/toolbarmanager.cxx |3 ++-
framework/source/uielement/toolbarmerger.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4a71d128bba69f7b91fe46fad5731caac6ca6ba2
Author: David Tardon dtar...@redhat.com
Date: Tue Jan 10 13:31:33 2012 +0100
workaround internal compiler error with gcc 4.7
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 8d4f984..0104b65 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1379,7 +1379,8 @@ void ToolBarManager::FillToolbar( const Reference
XIndexAccess rItemContaine
{
aCmdInfo.nId = nId;
aCmdInfo.nWidth = nWidth;
-m_aCommandMap.insert( CommandToInfoMap::value_type(
aCommandURL, aCmdInfo ));
+const CommandToInfoMap::value_type aValue(
aCommandURL, aCmdInfo );
+m_aCommandMap.insert( aValue );
}
else
{
diff --git a/framework/source/uielement/toolbarmerger.cxx
b/framework/source/uielement/toolbarmerger.cxx
index 4b5da50..7e2a5f7 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -516,7 +516,8 @@ bool ToolBarMerger::MergeItems(
{
CommandInfo aCmdInfo;
aCmdInfo.nId = rItemId;
-rCommandMap.insert( CommandToInfoMap::value_type(
rItem.aCommandURL, aCmdInfo ));
+const CommandToInfoMap::value_type aValue(
rItem.aCommandURL, aCmdInfo );
+rCommandMap.insert( aValue );
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - icu/makefile.mk libxml2/makefile.mk
icu/makefile.mk |2 +- libxml2/makefile.mk | 13 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) New commits: commit 0ffc8c0d70860e1da3b71eb3ffbb30a0d463ddef Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 10 13:13:59 2012 + build debugging libxml2 with -g diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 1d125c1..78c4c3e 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -106,10 +106,19 @@ BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ENDIF .ELSE + +.IF $(debug) != +xml2_CFLAGS+=-g +.ELSE +xml2_CFLAGS+=-O +.ENDIF + +xml2_CFLAGS+=$(ARCH_FLAGS) + .IF $(SYSBASE)!= xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include .IF $(COMNAME)==sunpro5 -xml2_CFLAGS+=$(ARCH_FLAGS) $(C_RESTRICTIONFLAGS) +xml2_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # $(COMNAME)==sunpro5 xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # $(SYSBASE)!= @@ -121,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF -CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes ADDCFLAGS=$(xml2_CFLAGS) $(EXTRA_CFLAGS) LDFLAGS=$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS) +CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes CFLAGS=$(xml2_CFLAGS) $(EXTRA_CFLAGS) LDFLAGS=$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) commit 7c21df4eb3a977de368b40906b9808d078349f9e Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 10 13:13:19 2012 + typo in .IF diff --git a/icu/makefile.mk b/icu/makefile.mk index cb02475..02f94a4 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -82,7 +82,7 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # $(EXTRA_CFLAGS)!= .ENDIF # $(OS)==MACOSX -.IF $(debug) != +.IF $(debug) != icu_CFLAGS+=-g $(ARCH_FLAGS) icu_CXXFLAGS+=-g $(ARCH_FLAGS) .ELSE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Library_merged.mk solenv/gbuild
Library_merged.mk | 32 ++--
solenv/gbuild/Library.mk |2 -
solenv/gbuild/LinkTarget.mk| 23 +++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 50 +
4 files changed, 62 insertions(+), 45 deletions(-)
New commits:
commit a74627d53eea219ceb26ce0d341cdf218ed0dd0a
Author: Matúš Kukan matus.ku...@gmail.com
Date: Fri Jan 6 10:48:43 2012 +0100
improve support for merging libraries
diff --git a/Library_merged.mk b/Library_merged.mk
index 4a8ccaf..9fe9c2d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -21,26 +21,16 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-
$(eval $(call gb_Library_Library,merged))
-$(eval $(call gb_Library_add_linked_libs,merged,$(filter-out
$(gb_MERGED_LIBS),\
- avmedia \
+$(eval $(call gb_Library_add_linked_libs,merged,\
basegfx \
- canvastools \
comphelper \
- cppcanvas \
cppu \
cppuhelper \
- drawinglayer \
- editeng \
fwe \
i18nisolang1 \
i18npaper \
- i18nutil \
- jvmfwk \
- lng \
- fwe \
sal \
salhelper \
sax \
@@ -49,28 +39,24 @@ $(eval $(call
gb_Library_add_linked_libs,merged,$(filter-out $(gb_MERGED_LIBS),\
sot \
svl \
svt \
- svx \
- svxcore \
tk \
tl \
ucbhelper \
utl \
vcl \
- xo \
xcr \
$(gb_STDLIBS) \
-)))
+))
$(eval $(call gb_Library_use_externals,merged,\
- icui18n \
+ berkeleydb \
icuuc \
- jpeg \
- libxml2 \
zlib \
))
+# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
$(eval $(call gb_Library_add_library_objects,merged,\
- $(gb_CORE_LIBS) \
+ $(gb_MERGEDLIBS) \
))
ifeq ($(OS),WNT)
@@ -85,12 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
))
endif
-# something is missing here for sure
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_linked_libs,merged,\
- objc \
- Cocoa \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b9173ea..13258b8 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -106,7 +106,7 @@ endef
# gb_Library__get_final_target has been invented for that purpose...
define gb_Library_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(call
gb_Library__get_componentprefix,$(1)),\
- $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter
$(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1
+ $(call gb_Library_get_runtime_filename,$(if $(filter
$(1),$(gb_MERGEDLIBS)),merged,$(1
$(call gb_Library__get_final_target,$(1)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_ComponentTarget_get_target,$(2)) :| $(call
gb_Library_get_target,$(1))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4dbd46..e8f9bab 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -46,17 +46,6 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
endif
-# if enabled we link all of these libraries into one larger, merged library
-# for which we can do a lot more optimisation, and which is faster to read
-# from disk.
-ifeq ($(MERGELIBS),TRUE)
-# list of libraries which are always loaded, thus we can merge them into one
-# they have to be from tail_build, so we could link against merged library
-gb_CORE_LIBS := \
- uui \
-
-endif
-
# Overview of dependencies and tasks of LinkTarget
#
# target task depends on
@@ -357,8 +346,10 @@ mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2))
endef
+# If object files from this library are merged, create just empty file
$(call gb_LinkTarget_get_target,%) : $(call
gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
- $(call gb_LinkTarget__command,$@,$*)
+ $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS),$(call
gb_Library_get_linktargetname,$(lib, \
+ touch $@, $(call gb_LinkTarget__command,$@,$*))
$(call gb_LinkTarget__command_objectlist,$@,$*)
ifeq ($(gb_FULLDEPS),$(true))
@@ -639,11 +630,9 @@ $$(eval $$(call gb_Output_info,currently known libraries
are: $(sort $(gb_Librar
$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk))
endif
-ifeq ($(MERGELIBS),TRUE)
-gb_LINKED_LIBS := $(if $(filter $(gb_CORE_LIBS),$(2)),merged $(filter-out
$(gb_CORE_LIBS),$(2)),$(2))
-else
-gb_LINKED_LIBS := $(2)
-endif
+gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
+ $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call
[Libreoffice-commits] .: 2 commits - vcl/generic
vcl/generic/print/genprnpsp.cxx | 47 ---
vcl/generic/print/genpspgraphics.cxx | 16 ++-
2 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit 5e3612b1d5923845bf955231278f45b4e3089951
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 10 13:32:36 2012 +
can drop intermediate strings now
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 83b3418..18980a4 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -357,10 +357,9 @@ static bool sendAFax( const OUString rFaxNumber, const
OUString rFileName, con
{
while( aFaxNumbers.begin() != aFaxNumbers.end() bSuccess )
{
-OUString aCmdLine( rCommand );
OUString aFaxNumber( aFaxNumbers.front() );
aFaxNumbers.pop_front();
-aCmdLine = comphelper::string::replace( aCmdLine, OUString(
RTL_CONSTASCII_USTRINGPARAM( (PHONE) ) ), aFaxNumber );
+OUString aCmdLine = comphelper::string::replace( rCommand,
OUString( RTL_CONSTASCII_USTRINGPARAM( (PHONE) ) ), aFaxNumber );
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, sending fax to \%s\\n, OUStringToOString(
aFaxNumber, osl_getThreadTextEncoding() ).getStr() );
#endif
@@ -383,8 +382,7 @@ static bool sendAFax( const OUString rFaxNumber, const
OUString rFileName, con
static bool createPdf( const OUString rToFile, const OUString rFromFile,
const OUString rCommandLine )
{
#if defined( UNX )
-OUString aCommandLine( rCommandLine );
-aCommandLine = comphelper::string::replace( aCommandLine, OUString(
RTL_CONSTASCII_USTRINGPARAM( (OUTFILE) ) ), rToFile );
+OUString aCommandLine = comphelper::string::replace( rCommandLine,
OUString( RTL_CONSTASCII_USTRINGPARAM( (OUTFILE) ) ), rToFile );
return passFileToCommandLine( rFromFile, aCommandLine );
#else
commit 6dc465535784fa8964fbd7d1b12eaecadf027cdc
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Jan 10 10:42:55 2012 +0100
Replace (Byte)String with rtl::O(U)String
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 747b0ec..83b3418 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -83,7 +83,7 @@ extern C
{
typedef int(*setupFunction)(PrinterInfo);
static setupFunction pSetupFunction = NULL;
-typedef int(*faxFunction)(String);
+typedef int(*faxFunction)(OUString);
static faxFunction pFaxNrFunction = NULL;
}
@@ -170,7 +170,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
pJobSetup-mnPaperBin = 0;
if( rData.m_pParser )
-pKey= rData.m_pParser-getKey( String(
RTL_CONSTASCII_USTRINGPARAM( InputSlot ) ) );
+pKey= rData.m_pParser-getKey( OUString(
RTL_CONSTASCII_USTRINGPARAM( InputSlot ) ) );
if( pKey )
pValue = rData.m_aContext.getValue( pKey );
if( pKey pValue )
@@ -190,7 +190,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
pJobSetup-meDuplexMode = DUPLEX_UNKNOWN;
if( rData.m_pParser )
-pKey = rData.m_pParser-getKey( String( RTL_CONSTASCII_USTRINGPARAM(
Duplex ) ) );
+pKey = rData.m_pParser-getKey( OUString( RTL_CONSTASCII_USTRINGPARAM(
Duplex ) ) );
if( pKey )
pValue = rData.m_aContext.getValue( pKey );
if( pKey pValue )
@@ -231,7 +231,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup,
JobData rData )
// Needs a cleaner abstraction ...
#if defined( UNX )
-static bool passFileToCommandLine( const String rFilename, const String
rCommandLine, bool bRemoveFile = true )
+static bool passFileToCommandLine( const OUString rFilename, const OUString
rCommandLine, bool bRemoveFile = true )
{
bool bSuccess = false;
@@ -315,19 +315,19 @@ static bool passFileToCommandLine( const String
rFilename, const String rComma
}
#endif
-static bool sendAFax( const String rFaxNumber, const String rFileName, const
String rCommand )
+static bool sendAFax( const OUString rFaxNumber, const OUString rFileName,
const OUString rCommand )
{
#if defined( UNX )
std::list OUString aFaxNumbers;
-if( ! rFaxNumber.Len() )
+if( rFaxNumber.isEmpty() )
{
getPaLib();
if( pFaxNrFunction )
{
-String aNewNr;
+OUString aNewNr;
if( pFaxNrFunction( aNewNr ) )
-aFaxNumbers.push_back( OUString( aNewNr ) );
+aFaxNumbers.push_back( aNewNr );
}
}
else
@@ -357,11 +357,10 @@ static bool sendAFax( const String rFaxNumber, const
String rFileName, const S
{
while( aFaxNumbers.begin() != aFaxNumbers.end() bSuccess )
{
-String aCmdLine( rCommand );
-String aFaxNumber( aFaxNumbers.front() );
+OUString aCmdLine( rCommand
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source extensions/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 29 +++--
connectivity/source/drivers/mozab/mozab.xcu|2
connectivity/source/drivers/mozab/mozab2.xcu |2
extensions/source/abpilot/abspilot.src |2
4 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit 3da441dfc06f0659e6dafc6dee16fbe74270e102
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 9 23:56:33 2012 +0100
Enabling Icedove addressbook connection for Base (Thank you Caolan)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 2921660..6382dfe 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -69,24 +69,27 @@ namespace
}
// ---
-static const char* DefaultProductDir[3][3] =
+const size_t NB_PRODUCTS = 3;
+const size_t NB_CANDIDATES = 4;
+
+static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{
#if defined(XP_WIN)
-{ Mozilla/SeaMonkey/, NULL, NULL },
-{ Mozilla/Firefox/, NULL, NULL },
-{ Thunderbird/, Mozilla/Thunderbird/, NULL }
+{ Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Mozilla/Firefox/, NULL, NULL, NULL },
+{ Thunderbird/, Mozilla/Thunderbird/, NULL, NULL }
#elif(MACOSX)
-{ ../Mozilla/SeaMonkey/, NULL, NULL },
-{ Firefox/, NULL, NULL },
-{ ../Thunderbird/, NULL, NULL }
+{ ../Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Firefox/, NULL, NULL, NULL },
+{ ../Thunderbird/, NULL, NULL, NULL }
#else
-{ .mozilla/seamonkey/, NULL, NULL },
-{ .mozilla/firefox/, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/ }
+{ .mozilla/seamonkey/, NULL, NULL, NULL },
+{ .mozilla/firefox/, NULL, NULL, NULL },
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
#endif
};
-static const char* ProductRootEnvironmentVariable[3] =
+static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
{
MOZILLA_PROFILE_ROOT,
MOZILLA_FIREFOX_PROFILE_ROOT,
@@ -98,7 +101,7 @@ namespace
{
size_t productIndex = _product - 1;
-static ::rtl::OUString s_productDirectories[3];
+static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
if ( !s_productDirectories[ productIndex ].getLength() )
{
@@ -117,7 +120,7 @@ namespace
const char* pProfileRegistry = profiles.ini;
// check all possible candidates
-for ( size_t i=0; i3; ++i )
+for ( size_t i=0; iNB_CANDIDATES; ++i )
{
if ( NULL == DefaultProductDir[ productIndex ][ i ] )
break;
diff --git a/connectivity/source/drivers/mozab/mozab.xcu
b/connectivity/source/drivers/mozab/mozab.xcu
index fa732d6..e554e46 100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -84,7 +84,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=Features
node oor:name=EscapeDateTime oor:op=replace
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu
b/connectivity/source/drivers/mozab/mozab2.xcu
index d1a620d..d6a6317 100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -52,7 +52,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=MetaData
node oor:name=SupportsBrowsing oor:op=replace
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 289e466..c246af9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE
{
HelpID = extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD;
Size= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-Text [ en-US ] = Thunderbird;
+Text [ en-US ] = Thunderbird/Icedove;
};
RadioButton RB_KAB
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/Library_pl.mk
extensions/Library_pl.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit a2dd79d14ee2e76e3b6c13f2880706292ea90c26 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jan 10 16:11:17 2012 +0100 Make nsplugin link on Mac. diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 96bcdb5..8e66c36 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -104,6 +104,12 @@ $(eval $(call gb_Library_set_include,pl,\ -I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers \ )) +$(eval $(call gb_Library_use_externals,pl,\ +cocoa \ +carbon \ +corefoundation \ +)) + else # GUIBASE!=aqua ifeq ($(ENABLE_GTK),TRUE) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source sdext/source slideshow/test svx/source sw/source unotools/source unoxml/test vcl/aqua vcl/ios vcl/source vcl/test vcl/win
oox/source/token/propertynames.cxx |2 +-
sdext/source/pdfimport/filterdet.cxx |4 ++--
slideshow/test/demoshow.cxx |2 +-
svx/source/dialog/linkwarn.cxx |2 +-
svx/source/svdraw/svdotext.cxx |2 +-
sw/source/filter/ww1/w1class.cxx |2 +-
sw/source/filter/ww1/w1sprm.cxx |2 +-
sw/source/filter/ww8/ww8par6.cxx |4 ++--
unotools/source/misc/fontdefs.cxx|2 +-
unoxml/test/domtest.cxx | 10 +-
vcl/aqua/source/gdi/salgdi.cxx |2 +-
vcl/ios/source/gdi/salgdi.cxx|2 +-
vcl/source/gdi/sallayout.cxx |2 +-
vcl/source/window/window.cxx |2 +-
vcl/test/canvasbitmaptest.cxx|2 +-
vcl/win/source/gdi/salgdi3.cxx |4 ++--
16 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 2c3d0ff9f83aab89980529da2aa3837390b84ef7
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Jan 10 16:00:18 2012 +0100
Use SAL_N_ELEMENTS
Some more like Thorstens diff 9c59cd15b150638c845bbc275b9b04460afc23bd
Done with some regex magic (and a check if this var is an array):
s/sizeof\(\s*$var\s*\)\s*\/\s*sizeof\(\s*\*$var\s*/SAL_N_ELEMENTS\($var/gs
diff --git a/oox/source/token/propertynames.cxx
b/oox/source/token/propertynames.cxx
index a7c9b87..d65c8d2 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -41,7 +41,7 @@ PropertyNameVector::PropertyNameVector()
};
-size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof(
*sppcPropertyNames )) - 1;
+size_t nArraySize = SAL_N_ELEMENTS(sppcPropertyNames) - 1;
reserve( nArraySize );
for( size_t nIndex = 0; nIndex nArraySize; ++nIndex )
push_back( ::rtl::OUString::createFromAscii( sppcPropertyNames[ nIndex
] ) );
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index 28fd126..969f378 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -139,8 +139,8 @@ namespace {
xPropSet-getPropertyValue(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( Label ))) = aLabel;
const char pFileName[] = %FILENAME;
aLabel = aLabel.replaceAt(
-
aLabel.indexOfAsciiL(pFileName,sizeof(pFileName)/sizeof(*pFileName)-1),
-sizeof(pFileName)/sizeof(*pFileName)-1,
+aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1),
+SAL_N_ELEMENTS(pFileName)-1,
aFilename );
xPropSet-setPropertyValue(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( Label )),
uno::makeAny(aLabel));
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index f52ba55..692251e 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -278,7 +278,7 @@ private:
};
static PropMapT aMap( lcl_propertyMap,
- sizeof(lcl_propertyMap)/sizeof(*lcl_propertyMap),
+ SAL_N_ELEMENTS(lcl_propertyMap),
true );
sal_Int16 aRes;
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 5beecf0..6bc3a1b 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -114,7 +114,7 @@ void SvxLinkWarningDialog::InitSize()
m_aLinkGraphicBtn, m_aEmbedGraphicBtn, m_aOptionLine,
m_aWarningOnBox
};
Window** pCurrent = pWins;
-for ( sal_uInt32 i = 0; i sizeof(pWins) / sizeof(*pWins); ++i,
++pCurrent )
+for ( sal_uInt32 i = 0; i SAL_N_ELEMENTS(pWins); ++i, ++pCurrent )
{
Point aNewPos = (*pCurrent)-GetPosPixel();
aNewPos.Y() -= nDelta;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 620b677..e43b160 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1281,7 +1281,7 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner rOutliner,
const Size rTextSize,
// loop early-exits if we detect an already attained value
sal_uInt16 nMinStretchX=0, nMinStretchY=0;
sal_uInt16 aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0};
-const size_t
aStretchArySize=sizeof(aOldStretchXVals)/sizeof(*aOldStretchXVals);
+const size_t aStretchArySize=SAL_N_ELEMENTS(aOldStretchXVals);
for(unsigned int i=0; iaStretchArySize; ++i)
{
const Size aCurrTextSize = rOutliner.CalcTextSizeNTP();
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index a7e35cd..c1630ca 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -160,7 +160,7 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*p, sal_uInt16
rnCountBytes, sal_uInt1
size_t nSize(stc);
if (!nSize)
pStr = W1 Normal;
-else if (nSize - 222 = sizeof(names) / sizeof(*names))
+else
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.3'
Tag 'libreoffice-3.4.99.3' created by Petr Mladek pmla...@suse.cz at 2012-01-10 16:14 +0100 Tag 3.4.99.3 (3.5.0-beta3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPDGQCAAoJEPQ0oe+v7q6ju3UP/AhJTJDs2pk4VsTj0BWPLNge qSO5h9DHSejN5mvmu+LBpYznB9PJ2+h5oT2T4eVNbmkNdgEuMzH5CTl1Wzdls7Wi WvU+4lVa5p5/BEPXdTYG0IALV06t3aH1CKR9LYsoeJOUgA80s/Bx2b2BQHJwKgqR 9whBa/n4kBgV0o5KemHiwvV5xWAImPQUxgGiF9UmeDCtbJpgFJOKrOBbW84h255j ot9GF5esmRgg9zHNeL1iF6ypXvaMRQ/eIyfnuJHFxFDNlfCifMOpm9WMJRLFcfKb q+DguRvTaxB96oOcAzOWsqzg6A/ozpmKOxHxY/pS5//3v7oJd2f7ClnZO03MZBk9 xCkxVgiBPPQiEvgfXXWLlBMOM+AzdzFF4HD4x9+zoM2f0vyYFddI/lEHzUZbWx6l RfX0C/9xtS1vdeHZrHtId09juAZanZnQlQLbgvz3RT5rwhwizpHavJVDupdhsJ+y 1zj1/nmE9jEWDB4424ZwFpPSftrupMWWQyTN6mTo2Vmy+PaiIviAfGmZUwbLR+Li hMeAuFoKGiEQIu5zm1iiR4yArg0kUQcdXM29roxcQDc6V6AvjAuooF70lrfhVLdv 8vcOUX1kk1m2M3v5W9X+YaFPWwEXq/RopdmZtS3uQkHl0s6IGN+kDO+b69Qnm1Kk ECNW06XBGeqSmwyjjTiD =IhtD -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-508: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.3'
Tag 'libreoffice-3.4.99.3' created by Petr Mladek pmla...@suse.cz at 2012-01-10 16:14 +0100 Tag 3.4.99.3 (3.5.0-beta3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPDGQCAAoJEPQ0oe+v7q6jhv8QALcAb2MH+ONz3ZKpGSjab6Nl t9tIRE+f8kGnbhhHDG36iXUBGRraV8SCYK0ovvNil9lbDDFhvTmKc0ZXiToKgtM+ ET0lgc5veijjTNgEwR5Wq+Py1LO7O+uYIF4PLQpwgARJMDgjfjtmhWK5VqOp1ega mi6NEEL1UptjUym35zk/Y+EWjpCuf10FZysPh712UhgTAkBbuzcS/AlLuI1jje8q pCRWg1EjZ05Sld5faQxfhk3/I9MPnnmdcqgXSuoknUzWMkNeo7wBRcyxNLhAjkKS MiAWokIVWFWPtxIUwrJk/wY8tnFbgJbtzpf72meagEKJoN+zThDEgNlwy0HzHXHf aN/tEqMeiL4wwHkKUiZ6NmWN678JQcdsztkt3e1GcMkOKTIW3TcfCJp+t4UiSC+j winLgNJ4kp5jlKjtxSFDpfX9msoaB8fa4lgcrk4k0liPL6qRitFaS8quNGtqppIO EZwszGJfrhGdbgeYGbTrDaGWNh46KvckyUWISEcgsaSs8diFGb7w5+zGVWLwP1CU 8GylC/JxIRtHmbe/Xytn/0KldCQS0OLYNIfvlbVyelLVHe5d9nRqaotAHzHziVO8 MROImSdv2canviydByP13BflMiMb0Dcho78fC+p4I3wm8ydNf+WljNMjGryK5Yra dLc51c4Kx5xNF0nv0onu =gZpe -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.3'
Tag 'libreoffice-3.4.99.3' created by Petr Mladek pmla...@suse.cz at 2012-01-10 16:14 +0100 Tag 3.4.99.3 (3.5.0-beta3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPDGQCAAoJEPQ0oe+v7q6j6HoP/ivjqvcScWDQCrfugpm/LSbk tRsk/eEgQwcQrxquop2o5C5NXRqdjmofvMzCWtl2zDT4Nc5gOBA5JgmdJjPtnwSl uxS4s0DF4lUo6AT8lWjxhj56K2vrVG7jmIaq8zdqibTnXCmgQ/d2DGwNMi6R6uLL 8Ut6E3DCtsDA4QvWYDkHM2Byrs/elvtOCOCmQRW4v6GhATbl4cyhzUBtKyjFkCX4 OmSjvaxpw8093jQfWQ3MdcL6BNqC0ksPb+HmcNZYgjX3eiq8H5zKS7uMcWKhRflt 6JG2ctB/WL9p8PIwlOXGcJGVVudrmYrfpPUgb1bybs+D8S3bi3qbHm0bueVwQ2de csw8pCYL77zorRUjt+D2HzTp1Xrok4zdpLLXEfA1s6XVRvNO754QC2Up/frifXcO H7n3Vbc7/OfHZ2lC0Y48rAummCbkpskdtIci+Ubihtf3uZ3S0LFG4h4vMXaaMfiV 2Oo6k8zIZ68PYZGgNfHJeVtBtZXmmHRhbDsduSmu54xIrob87/sQJtU8wdMvXvIZ lmgJegT/wLMjW7QnFHY0nAvu63QOGX+e8IdBQyer6PHF7CLX5Ge8n4FTrTR00l04 y/5bktzaSABDVthj5D4ybpDHdoeove3GPLil7rW1ClMwEbbD24Pr4n3quPFyXegO aZOuKGvl7Q1hle/krGPd =LDdd -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-24: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - RepositoryModule_ooo.mk cui/source solenv/gbuild
RepositoryModule_ooo.mk |1 +
cui/source/dialogs/winpluginlib.cxx |2 +-
solenv/gbuild/Executable.mk |4
solenv/gbuild/Helper.mk |1 +
4 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 5a0ab1a45858f4f7336f6dbdc218502cc31f0168
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 17:50:47 2012 +0100
gbuild: Executable.mk: don't build unregistered exes
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 7858967..2c5d9ea 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -43,6 +43,10 @@ $(call gb_Executable_get_target,%) :
$(foreach target,$(AUXTARGETS), $(call
gb_Deliver_deliver,$(dir $)/$(notdir $(target)),$(target
define gb_Executable_Executable
+ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
+$$(eval $$(call gb_Output_info,Currently known executables: $(sort
$(gb_Executable_KNOWN)),ALL))
+$$(eval $$(call gb_Output_error,Executable $(1) must be registered in
Repository.mk))
+endif
$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e27d2ee..84e6cd9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -116,6 +116,7 @@ endef
define gb_Helper_collect_knownlibs
gb_Library_KNOWNLIBS := $$(foreach
group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
gb_StaticLibrary_KNOWNLIBS := $$(foreach
group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+gb_Executable_KNOWN := $$(foreach
group,$$(gb_Executable_VALIDGROUPS),$$(gb_Executable_$$(group)))
endef
commit 7608feeb7b490915c85ef75db33acdb8baef0c23
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 15:25:38 2012 +0100
RepositoryModule_ooo.mk: add cppuhelper
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f89b393..58cbaff 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
configmgr \
cppcanvas \
cppu \
+cppuhelper \
cui \
dbaccess \
desktop \
commit f6260b19dbed41e573209d598fee1d78f906eec4
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 14:16:00 2012 +0100
cui: remove unused macro for renamed library
diff --git a/cui/source/dialogs/winpluginlib.cxx
b/cui/source/dialogs/winpluginlib.cxx
index 25fa4a3..237e33b 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -38,7 +38,7 @@
#include stdio.h
#define SO_PATH_SIZE4096
-#define MOZ_PLUGIN_DLL_NAME npsopluginmi.dll
+
extern C {
int lc_isInstalled(const char* realFilePath)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/Executable_nsplugin.mk extensions/Library_npsoplugin.mk
extensions/Executable_nsplugin.mk |8 extensions/Library_npsoplugin.mk |5 - 2 files changed, 8 insertions(+), 5 deletions(-) New commits: commit 9af656af19eb465b3d45b43fb281ad541fa9b32c Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jan 10 18:28:11 2012 +0100 pathutils-obj is in static library ooopathutils diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 6bc58fb..383db00 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -56,14 +56,14 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\ )) ifeq ($(GUI),WNT) -$(eval $(call gb_Executable_add_ldflags,nsplugin,\ - $(OUTDIR)/lib/pathutils-obj.obj \ -)) - $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/nsp_windows \ )) +$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ + ooopathutils \ +)) + $(eval $(call gb_Executable_add_linked_libs,nsplugin,\ ws2_32 \ shell32 \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index f542f59..1a30d13 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -59,10 +59,13 @@ endif # GUI=UNX ifeq ($(GUI),WNT) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ - $(OUTDIR)/lib/pathutils-obj.obj \ $(OUTDIR)/lib/npwin.obj \ )) +$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ + ooopathutils \ +)) + $(eval $(call gb_Library_add_linked_libs,npsoplugin,\ ws2_32 \ shell32 \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/excel/excform8.cxx |8 +-
sc/source/filter/excel/read.cxx |1
sc/source/filter/excel/xiname.cxx | 125 +++-
sc/source/filter/inc/xiname.hxx | 36 --
sc/source/filter/inc/xistream.hxx |2
5 files changed, 119 insertions(+), 53 deletions(-)
New commits:
commit 4f888c9c01c77500ca181890f69cbd9883324a74
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 14:26:14 2012 -0500
fdo#42624: Defer formula token conversion for defined names (xls import).
This is necessary for handling names that cross-reference each other.
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index f06f9c8..9693fe8 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -487,11 +487,11 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
const XclImpName* pName = GetNameManager().GetName( nUINT16 );
if (pName)
{
-if (pName-GetScRangeData())
-aStack aPool.StoreName(nUINT16, pName-IsGlobal());
-else
-// used-defined macro name.
+if (pName-IsMacro())
+// user-defined macro name.
aStack aPool.Store(ocMacro, pName-GetXclName());
+else
+aStack aPool.StoreName(nUINT16, pName-IsGlobal());
}
}
break;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 81e6f6a..30acae7 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -1001,6 +1001,7 @@ FltError ImportExcel8::Read( void )
rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles();
rPTableMgr.ReadPivotCaches( maStrm );
+rNameMgr.ConvertAllTokens();
eAkt = EXC_STATE_BEFORE_SHEET;
}
break;
diff --git a/sc/source/filter/excel/xiname.cxx
b/sc/source/filter/excel/xiname.cxx
index f2f5e8d..9cdfe77 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -40,19 +40,26 @@
// *** Implementation ***
//
+XclImpName::TokenStrmData::TokenStrmData( XclImpStream rStrm ) :
+mrStrm(rStrm), mnStrmPos(0), mnStrmSize(0) {}
+
XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16 nXclNameIdx ) :
XclImpRoot( rStrm.GetRoot() ),
mpScData( 0 ),
mcBuiltIn( EXC_BUILTIN_UNKNOWN ),
mnScTab( SCTAB_MAX ),
-mbFunction( false ),
-mbVBName( false )
+meNameType( RT_NAME ),
+mnXclTab( EXC_NAME_GLOBAL ),
+mnNameIndex( nXclNameIdx ),
+mbVBName( false ),
+mbMacro( false ),
+mpTokensData( NULL )
{
ExcelToSc rFmlaConv = GetOldFmlaConverter();
// 1) *** read data from stream *** ---
-sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL, nXclTab
= EXC_NAME_GLOBAL;
+sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL;
sal_uInt8 nNameLen = 0, nShortCut;
switch( GetBiff() )
@@ -78,7 +85,7 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
case EXC_BIFF5:
case EXC_BIFF8:
{
-rStrm nFlags nShortCut nNameLen nFmlaSize nExtSheet
nXclTab;
+rStrm nFlags nShortCut nNameLen nFmlaSize nExtSheet
mnXclTab;
rStrm.Ignore( 4 );
}
break;
@@ -94,8 +101,9 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
// 2) *** convert sheet index and name ***
// functions and VBA
-mbFunction = ::get_flag( nFlags, EXC_NAME_FUNC );
+bool bFunction = ::get_flag( nFlags, EXC_NAME_FUNC );
mbVBName = ::get_flag( nFlags, EXC_NAME_VB );
+mbMacro = ::get_flag( nFlags, EXC_NAME_PROC );
// get built-in name, or convert characters invalid in Calc
bool bBuiltIn = ::get_flag( nFlags, EXC_NAME_BUILTIN );
@@ -131,11 +139,9 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
rtl::OUString aRealOrigName = maScName;
// add index for local names
-if( nXclTab != EXC_NAME_GLOBAL )
+if( mnXclTab != EXC_NAME_GLOBAL )
{
-sal_uInt16 nUsedTab = (GetBiff() == EXC_BIFF8) ? nXclTab : nExtSheet;
-// do not rename sheet-local names by default, this breaks VBA scripts
-//maScName.Append( '_' ).Append( String::CreateFromInt32( nUsedTab ) );
+sal_uInt16 nUsedTab = (GetBiff() == EXC_BIFF8) ? mnXclTab : nExtSheet;
// TODO: may not work for BIFF5, handle skipped sheets (all BIFF)
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/excform8.cxx |8 +-
sc/source/filter/excel/read.cxx |1
sc/source/filter/excel/xiname.cxx | 125 +++-
sc/source/filter/inc/xiname.hxx | 36 --
sc/source/filter/inc/xistream.hxx |2
5 files changed, 119 insertions(+), 53 deletions(-)
New commits:
commit d041d1469227f5536abba938a21ab7c8e9d35719
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 14:26:14 2012 -0500
fdo#42624: Defer formula token conversion for defined names (xls import).
This is necessary for handling names that cross-reference each other.
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index f06f9c8..9693fe8 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -487,11 +487,11 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*
rpTokArray, XclImpStream aIn,
const XclImpName* pName = GetNameManager().GetName( nUINT16 );
if (pName)
{
-if (pName-GetScRangeData())
-aStack aPool.StoreName(nUINT16, pName-IsGlobal());
-else
-// used-defined macro name.
+if (pName-IsMacro())
+// user-defined macro name.
aStack aPool.Store(ocMacro, pName-GetXclName());
+else
+aStack aPool.StoreName(nUINT16, pName-IsGlobal());
}
}
break;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 81e6f6a..30acae7 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -1001,6 +1001,7 @@ FltError ImportExcel8::Read( void )
rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles();
rPTableMgr.ReadPivotCaches( maStrm );
+rNameMgr.ConvertAllTokens();
eAkt = EXC_STATE_BEFORE_SHEET;
}
break;
diff --git a/sc/source/filter/excel/xiname.cxx
b/sc/source/filter/excel/xiname.cxx
index f2f5e8d..9cdfe77 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -40,19 +40,26 @@
// *** Implementation ***
//
+XclImpName::TokenStrmData::TokenStrmData( XclImpStream rStrm ) :
+mrStrm(rStrm), mnStrmPos(0), mnStrmSize(0) {}
+
XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16 nXclNameIdx ) :
XclImpRoot( rStrm.GetRoot() ),
mpScData( 0 ),
mcBuiltIn( EXC_BUILTIN_UNKNOWN ),
mnScTab( SCTAB_MAX ),
-mbFunction( false ),
-mbVBName( false )
+meNameType( RT_NAME ),
+mnXclTab( EXC_NAME_GLOBAL ),
+mnNameIndex( nXclNameIdx ),
+mbVBName( false ),
+mbMacro( false ),
+mpTokensData( NULL )
{
ExcelToSc rFmlaConv = GetOldFmlaConverter();
// 1) *** read data from stream *** ---
-sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL, nXclTab
= EXC_NAME_GLOBAL;
+sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL;
sal_uInt8 nNameLen = 0, nShortCut;
switch( GetBiff() )
@@ -78,7 +85,7 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
case EXC_BIFF5:
case EXC_BIFF8:
{
-rStrm nFlags nShortCut nNameLen nFmlaSize nExtSheet
nXclTab;
+rStrm nFlags nShortCut nNameLen nFmlaSize nExtSheet
mnXclTab;
rStrm.Ignore( 4 );
}
break;
@@ -94,8 +101,9 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
// 2) *** convert sheet index and name ***
// functions and VBA
-mbFunction = ::get_flag( nFlags, EXC_NAME_FUNC );
+bool bFunction = ::get_flag( nFlags, EXC_NAME_FUNC );
mbVBName = ::get_flag( nFlags, EXC_NAME_VB );
+mbMacro = ::get_flag( nFlags, EXC_NAME_PROC );
// get built-in name, or convert characters invalid in Calc
bool bBuiltIn = ::get_flag( nFlags, EXC_NAME_BUILTIN );
@@ -131,11 +139,9 @@ XclImpName::XclImpName( XclImpStream rStrm, sal_uInt16
nXclNameIdx ) :
rtl::OUString aRealOrigName = maScName;
// add index for local names
-if( nXclTab != EXC_NAME_GLOBAL )
+if( mnXclTab != EXC_NAME_GLOBAL )
{
-sal_uInt16 nUsedTab = (GetBiff() == EXC_BIFF8) ? nXclTab : nExtSheet;
-// do not rename sheet-local names by default, this breaks VBA scripts
-//maScName.Append( '_' ).Append( String::CreateFromInt32( nUsedTab ) );
+sal_uInt16 nUsedTab = (GetBiff() == EXC_BIFF8) ? mnXclTab : nExtSheet;
// TODO: may not work for BIFF5, handle skipped sheets (all BIFF)
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/excel/read.cxx |6 ++
sc/source/filter/excel/xiname.cxx |2 ++
2 files changed, 8 insertions(+)
New commits:
commit 00c5189e092b74c118e03bdff4578b4de95378ad
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 14:47:35 2012 -0500
fdo#42624: Do the same for BIFF5 and earlier.
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 30acae7..4f0ce42 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -238,6 +238,7 @@ FltError ImportExcel::Read( void )
case 0x08: Row25(); break; // ROW [ 2 5]
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -300,6 +301,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -370,6 +372,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -424,6 +427,7 @@ FltError ImportExcel::Read( void )
switch( nOpcode )
{
case 0x0A: // EOF [ 2345]
+rNameMgr.ConvertAllTokens();
eAkt = Z_Ende;
break;
case 0x12: DocProtect(); break;// PROTECT [5]
@@ -487,6 +491,7 @@ FltError ImportExcel::Read( void )
case EXC_ID_RK: ReadRk(); break;
case 0x0A: // EOF [ 2345]
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Biff4E;
break;
@@ -584,6 +589,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles();
+rNameMgr.ConvertAllTokens();
eAkt = Z_Biff5E;
break;
case 0x18: rNameMgr.ReadName( maStrm );break;
diff --git a/sc/source/filter/excel/xiname.cxx
b/sc/source/filter/excel/xiname.cxx
index 9cdfe77..00f0d42 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens()
if (pArray)
InsertName(pArray);
+
+mpTokensData.reset();
}
void XclImpName::InsertName(const ScTokenArray* pArray)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/read.cxx |6 ++
sc/source/filter/excel/xiname.cxx |2 ++
2 files changed, 8 insertions(+)
New commits:
commit 8422e18b01843bac061c20a8aa47d1c43994a2d2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 14:47:35 2012 -0500
fdo#42624: Do the same for BIFF5 and earlier.
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 30acae7..4f0ce42 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -238,6 +238,7 @@ FltError ImportExcel::Read( void )
case 0x08: Row25(); break; // ROW [ 2 5]
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -300,6 +301,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -370,6 +372,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Ende;
break;
@@ -424,6 +427,7 @@ FltError ImportExcel::Read( void )
switch( nOpcode )
{
case 0x0A: // EOF [ 2345]
+rNameMgr.ConvertAllTokens();
eAkt = Z_Ende;
break;
case 0x12: DocProtect(); break;// PROTECT [5]
@@ -487,6 +491,7 @@ FltError ImportExcel::Read( void )
case EXC_ID_RK: ReadRk(); break;
case 0x0A: // EOF [ 2345]
+rNameMgr.ConvertAllTokens();
Eof();
eAkt = Z_Biff4E;
break;
@@ -584,6 +589,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles();
+rNameMgr.ConvertAllTokens();
eAkt = Z_Biff5E;
break;
case 0x18: rNameMgr.ReadName( maStrm );break;
diff --git a/sc/source/filter/excel/xiname.cxx
b/sc/source/filter/excel/xiname.cxx
index 9cdfe77..00f0d42 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens()
if (pArray)
InsertName(pArray);
+
+mpTokensData.reset();
}
void XclImpName::InsertName(const ScTokenArray* pArray)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk
Repository.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit b75ac42a1d27ddb3a8b7fe7f18126ae14049b4a4 Author: Michael Stahl mst...@redhat.com Date: Tue Jan 10 21:00:14 2012 +0100 Repository.mk: some special executable names on WNT diff --git a/Repository.mk b/Repository.mk index f030d16..419ff4f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,10 +76,17 @@ $(eval $(call gb_Helper_register_executables,OOO,\ else +ifeq ($(OS_FOR_BUILD),WNT) +$(eval $(call gb_Helper_register_executables,OOO,\ + soffice_bin \ + unopkg_bin \ +)) +else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) +endif ifeq ($(OS),MACOSX) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/ui/inc/navmgr.hxx | 29 +++---
sw/source/ui/wrtsh/navmgr.cxx | 87 +-
sw/source/ui/wrtsh/wrtsh1.cxx |2
3 files changed, 62 insertions(+), 56 deletions(-)
New commits:
commit 0e898354fc76339a9a007b30f1ebe123981d0426
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 22:07:29 2012 +0100
sw: SwNavigationMgr: don't store SwPositions
Using SwPosition to store the history is an awful ideal as that isn't
corrected when the node it points to is deleted, which could cause
crashes when the user then wants to jump there.
SwUnoCrsr looks like a better fit as it is automatically corrected.
diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx
index 423c3eb..29b63de 100644
--- a/sw/source/ui/inc/navmgr.hxx
+++ b/sw/source/ui/inc/navmgr.hxx
@@ -29,29 +29,32 @@
#ifndef SW_NAVMGR_HXX
#define SW_NAVMGR_HXX
+#include vector
+
+#include boost/shared_ptr.hpp
+
#include swtypes.hxx
-#include pam.hxx
-#include swdllapi.h
class SwWrtShell;
struct SwPosition;
+class SwUnoCrsr;
+
class SwNavigationMgr
{
private:
/*
* List of entries in the navigation history
- * Each entry is a SwPosition, which represents a position within the
document
- * SwPosition is given by a node index (SwNodeIndex) which usually
represents the paragraph the position is in
- * and an index (SwIndex), which represents the position inside this
paragraph.
- * You can find more on SwPositions at
http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout
+ * Entries are SwUnoCrsr because thos gets corrected automatically
+ * when nodes are deleted.
*
* The navigation history behaves as a stack, to which items are added
when we jump to a new position
* (e.g. click a link, or double click an entry from the navigator).
* Every use of the back/forward buttons results in moving the stack
pointer within the navigation history
*/
-std::vectorSwPosition m_entries;
-std::vectorSwPosition::size_type m_nCurrent; /* Current position within
the navigation history */
+typedef ::std::vector ::boost::shared_ptrSwUnoCrsr Stack_t;
+Stack_t m_entries;
+Stack_t::size_type m_nCurrent; /* Current position within the navigation
history */
SwWrtShell m_rMyShell; /* The active shell within which the navigation
occurs */
void GotoSwPosition(const SwPosition rPos);
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index f2d7460..6ee6222 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -33,6 +33,8 @@
#include sfx2/viewfrm.hxx
#include cmdid.h
#include view.hxx
+#include doc.hxx
+#include unocrsr.hxx
#include com/sun/star/frame/XLayoutManager.hpp
@@ -134,7 +136,7 @@ void SwNavigationMgr::goBack() {
}
m_nCurrent--;
/* Position cursor to appropriate navigation history entry */
-GotoSwPosition(m_entries[m_nCurrent]);
+GotoSwPosition(*m_entries[m_nCurrent]-GetPoint());
/* Refresh the buttons */
if (bForwardWasDisabled)
m_rMyShell.GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_FORWARD);
@@ -161,7 +163,7 @@ void SwNavigationMgr::goForward() {
* We have to increment it to go to the next entry
*/
m_nCurrent++;
-GotoSwPosition(m_entries[m_nCurrent]);
+GotoSwPosition(*m_entries[m_nCurrent]-GetPoint());
/* Refresh the buttons */
if (bBackWasDisabled)
m_rMyShell.GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_BACK);
@@ -188,30 +190,31 @@ bool SwNavigationMgr::addEntry(const SwPosition rPos) {
int curr = m_nCurrent; /* Index from which we'll twist the tail. */
int n = (number_ofm_entries - curr) / 2; /* Number of entries that
will swap places */
for (int i = 0; i n; i++) {
-SwPosition temp = m_entries[curr + i];
-m_entries[curr + i] = m_entries[number_ofm_entries -1 - i];
-m_entries[number_ofm_entries -1 - i] = temp;
+::std::swap(m_entries[curr + i], m_entries[number_ofm_entries -1 -
i]);
}
- if (m_entries.back() != rPos)
- m_entries.push_back(rPos);
-
-
+if (*m_entries.back()-GetPoint() != rPos)
+{
+SwUnoCrsr *const pCursor =
m_rMyShell.GetDoc()-CreateUnoCrsr(rPos);
+m_entries.push_back(::boost::shared_ptrSwUnoCrsr(pCursor));
+}
bRet = true;
}
else {
-if ( (m_entries.size() 0 m_entries.back() != rPos) ||
(m_entries.size() == 0) ) {
-m_entries.push_back(rPos);
+if ( (m_entries.size() 0 *m_entries.back()-GetPoint() != rPos)
|| (m_entries.size() == 0) ) {
+SwUnoCrsr *const pCursor =
m_rMyShell.GetDoc()-CreateUnoCrsr(rPos);
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source
sw/source/ui/inc/navmgr.hxx | 29 +++---
sw/source/ui/wrtsh/navmgr.cxx | 87 +-
sw/source/ui/wrtsh/wrtsh1.cxx |2
3 files changed, 62 insertions(+), 56 deletions(-)
New commits:
commit debb4be8886a4c5fd0a714dfd1b53306b836b800
Author: Michael Stahl mst...@redhat.com
Date: Tue Jan 10 22:07:29 2012 +0100
sw: SwNavigationMgr: don't store SwPositions
Using SwPosition to store the history is an awful ideal as that isn't
corrected when the node it points to is deleted, which could cause
crashes when the user then wants to jump there.
SwUnoCrsr looks like a better fit as it is automatically corrected.
(cherry picked from commit 0e898354fc76339a9a007b30f1ebe123981d0426)
diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/ui/inc/navmgr.hxx
index 423c3eb..29b63de 100644
--- a/sw/source/ui/inc/navmgr.hxx
+++ b/sw/source/ui/inc/navmgr.hxx
@@ -29,29 +29,32 @@
#ifndef SW_NAVMGR_HXX
#define SW_NAVMGR_HXX
+#include vector
+
+#include boost/shared_ptr.hpp
+
#include swtypes.hxx
-#include pam.hxx
-#include swdllapi.h
class SwWrtShell;
struct SwPosition;
+class SwUnoCrsr;
+
class SwNavigationMgr
{
private:
/*
* List of entries in the navigation history
- * Each entry is a SwPosition, which represents a position within the
document
- * SwPosition is given by a node index (SwNodeIndex) which usually
represents the paragraph the position is in
- * and an index (SwIndex), which represents the position inside this
paragraph.
- * You can find more on SwPositions at
http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout
+ * Entries are SwUnoCrsr because thos gets corrected automatically
+ * when nodes are deleted.
*
* The navigation history behaves as a stack, to which items are added
when we jump to a new position
* (e.g. click a link, or double click an entry from the navigator).
* Every use of the back/forward buttons results in moving the stack
pointer within the navigation history
*/
-std::vectorSwPosition m_entries;
-std::vectorSwPosition::size_type m_nCurrent; /* Current position within
the navigation history */
+typedef ::std::vector ::boost::shared_ptrSwUnoCrsr Stack_t;
+Stack_t m_entries;
+Stack_t::size_type m_nCurrent; /* Current position within the navigation
history */
SwWrtShell m_rMyShell; /* The active shell within which the navigation
occurs */
void GotoSwPosition(const SwPosition rPos);
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index f2d7460..6ee6222 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -33,6 +33,8 @@
#include sfx2/viewfrm.hxx
#include cmdid.h
#include view.hxx
+#include doc.hxx
+#include unocrsr.hxx
#include com/sun/star/frame/XLayoutManager.hpp
@@ -134,7 +136,7 @@ void SwNavigationMgr::goBack() {
}
m_nCurrent--;
/* Position cursor to appropriate navigation history entry */
-GotoSwPosition(m_entries[m_nCurrent]);
+GotoSwPosition(*m_entries[m_nCurrent]-GetPoint());
/* Refresh the buttons */
if (bForwardWasDisabled)
m_rMyShell.GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_FORWARD);
@@ -161,7 +163,7 @@ void SwNavigationMgr::goForward() {
* We have to increment it to go to the next entry
*/
m_nCurrent++;
-GotoSwPosition(m_entries[m_nCurrent]);
+GotoSwPosition(*m_entries[m_nCurrent]-GetPoint());
/* Refresh the buttons */
if (bBackWasDisabled)
m_rMyShell.GetView().GetViewFrame()-GetBindings().Invalidate(FN_NAVIGATION_BACK);
@@ -188,30 +190,31 @@ bool SwNavigationMgr::addEntry(const SwPosition rPos) {
int curr = m_nCurrent; /* Index from which we'll twist the tail. */
int n = (number_ofm_entries - curr) / 2; /* Number of entries that
will swap places */
for (int i = 0; i n; i++) {
-SwPosition temp = m_entries[curr + i];
-m_entries[curr + i] = m_entries[number_ofm_entries -1 - i];
-m_entries[number_ofm_entries -1 - i] = temp;
+::std::swap(m_entries[curr + i], m_entries[number_ofm_entries -1 -
i]);
}
- if (m_entries.back() != rPos)
- m_entries.push_back(rPos);
-
-
+if (*m_entries.back()-GetPoint() != rPos)
+{
+SwUnoCrsr *const pCursor =
m_rMyShell.GetDoc()-CreateUnoCrsr(rPos);
+m_entries.push_back(::boost::shared_ptrSwUnoCrsr(pCursor));
+}
bRet = true;
}
else {
-if ( (m_entries.size() 0 m_entries.back() != rPos) ||
(m_entries.size() == 0) ) {
-m_entries.push_back(rPos);
+if ( (m_entries.size() 0 *m_entries.back()-GetPoint() != rPos)
|| (m_entries.size() == 0) ) {
+SwUnoCrsr *const pCursor =
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/html/htmlexp.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit e882d40de210e3e98a546e89ff7701653c33f1d8
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jan 11 01:28:29 2012 +0900
fdo#44616: drop attributes FRAME and RULES of table for HTML 3.2
This fixes fdo#44616.
HTML 3.2 does not have these attributes:
http://www.w3.org/TR/REC-html32
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 0c27b45..1f36f9d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -735,11 +735,6 @@ void ScHTMLExport::WriteTables()
// TABLE ...
rtl::OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table);
-// FRAME=VOID, we do the styling of the cells in TD
-aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_frame).
-append(RTL_CONSTASCII_STRINGPARAM(=\)).
-append(OOO_STRING_SVTOOLS_HTML_TF_void).append('');
-
bTabHasGraphics = bTabAlignedLeft = false;
if ( bAll pDrawLayer )
PrepareGraphics( pDrawLayer, nTab, nStartCol, nStartRow,
@@ -769,11 +764,6 @@ void ScHTMLExport::WriteTables()
append(RTL_CONSTASCII_STRINGPARAM(=\)).
append(static_castsal_Int32(nColCnt)).append('');
-// RULES=NONE, we do the styling of the cells in TD
-aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_rules).
-append(RTL_CONSTASCII_STRINGPARAM(=\)).
-append(OOO_STRING_SVTOOLS_HTML_TR_none).append('');
-
// BORDER=0, we do the styling of the cells in TD
aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border).
append(RTL_CONSTASCII_STRINGPARAM(=\0\));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Repository.mk
Repository.mk | 364 +- 1 file changed, 182 insertions(+), 182 deletions(-) New commits: commit c48bac19685d3a66a9abeba8477e1b763a6b13bf Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Jan 10 16:11:20 2012 -0600 cosmetic: clean-up tab/space mix. diff --git a/Repository.mk b/Repository.mk index 419ff4f..3cc7a38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -79,25 +79,25 @@ else ifeq ($(OS_FOR_BUILD),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ soffice_bin \ - unopkg_bin \ +unopkg_bin \ )) else $(eval $(call gb_Helper_register_executables,OOO,\ - soffice.bin \ - unopkg.bin \ +soffice.bin \ +unopkg.bin \ )) endif ifeq ($(OS),MACOSX) $(eval $(call gb_Helper_register_executables,OOO,\ - officeloader \ +officeloader \ )) else $(eval $(call gb_Helper_register_executables,OOO,\ - oosplash \ +oosplash \ )) endif @@ -107,10 +107,10 @@ endif ifneq ($(WITH_MOZILLA),NO) $(eval $(call gb_Helper_register_executables,OOO,\ nsplugin \ - pluginapp.bin \ +pluginapp.bin \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pl \ +pl \ )) endif # WITH_MOZILLA @@ -124,31 +124,31 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - PptImporter \ - abp \ - adabas \ - adabasui \ - acc \ - agg \ - analysis \ - animcore \ - basctl \ - basebmp \ - bib \ - canvastools \ - communi \ - date \ - evtatt \ - forui \ - odbc \ - odbcbase \ - officebean \ - oox \ - ooxml \ - sdbc \ +PptImporter \ +abp \ +adabas \ +adabasui \ +acc \ +agg \ +analysis \ +animcore \ +basctl \ +basebmp \ +bib \ +canvastools \ +communi \ +date \ +evtatt \ +forui \ +odbc \ +odbcbase \ +officebean \ +oox \ +ooxml \ +sdbc \ AppleRemote \ avmedia \ - avmediaQuickTime \ +avmediaQuickTime \ basegfx \ chartcontroller \ chartmodel \ @@ -160,7 +160,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dba \ dbaxml \ dbmm \ - dbp \ +dbp \ dbtools \ dbu \ deploymentmisc \ @@ -168,19 +168,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ doctok \ drawinglayer \ editeng \ - egi \ - eme \ - epb \ - epg \ - epp \ - eps \ - ept \ - era \ - eti \ - exp \ - filterconfig \ - filtertracer \ - flash \ +egi \ +eme \ +epb \ +epg \ +epp \ +eps \ +ept \ +era \ +eti \ +exp \ +filterconfig \ +filtertracer \ +flash \ for \ frm \ fwe \ @@ -188,46 +188,46 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fwk \ fwl \ fwm \ - guesslang \ +guesslang \ helplinker \ hwp \ - hyphen \ +hyphen \ i18npaper \ i18nregexp \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ +icd \ +icg \ +idx \ +ime \ +ipb \ +ipd \ +ips \ +ipt \ +ipx \ +ira \ +itg \ +iti \ lng \ - lnth \ - log \ +lnth \ +log \ lwpft \ - MacOSXSpell \ +MacOSXSpell \ merged \ msfilter \ msword \ - msworks \ - odfflatxml \ +msworks \ +odfflatxml \ offacc \ - pcr \ - pdffilter \ - placeware \ - protocolhandler \ +pcr \ +pdffilter \ +placeware \ +protocolhandler \ qstart_gtk \ - res \ +res \ resourcemodel \ rpt \ rptui \ rptxml \ - rtftok \ +rtftok \ sax \ sb \ sc \ @@ -244,13 +244,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ simplecm \ sm \ smd \ - solver \ +solver \ sot \ spa \ - spell \ +spell \ spl \ sts \ - svgfilter \ +svgfilter \ svl \ svt \ svx \ @@ -258,7 +258,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sw \ swd \ swui \ - t602filter \ +t602filter \ textconversiondlgs \ tk \ tl \ @@ -266,7 +266,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ unoxml \ updatecheckui \ utl \ - uui \ +uui \ vbahelper \ vcl \ vclplug_gen \ @@ -275,19 +275,19 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ vclplug_kde \ vclplug_kde4 \ vclplug_svp \ - cdrimport \ - visioimport \ - wpft \ - wpgimport \ +cdrimport \ +visioimport \ +wpft \ +wpgimport \
[Libreoffice-commits] .: slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 34 -
1 file changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 122cb4ff9cdeea5c3c9b7a0a60f26cadb13a71fa
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Jan 11 00:05:50 2012 +0100
Fix fdo#43820 - properly initialize iterators before math.
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 80c142c..eea1202 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -725,9 +725,13 @@ namespace slideshow
class FindNthElementFunctor
{
public:
-FindNthElementFunctor( sal_Int32
nNodeIndex,
- DrawShapeSubsetting::IndexClassificator
eClass ) :
+FindNthElementFunctor( sal_Int32
nNodeIndex,
+
DrawShapeSubsetting::IndexClassificatorVector::const_iterator rLastBegin,
+
DrawShapeSubsetting::IndexClassificatorVector::const_iterator rLastEnd,
+ DrawShapeSubsetting::IndexClassificator
eClass ) :
mnNodeIndex( nNodeIndex ),
+mrLastBegin( rLastBegin ),
+mrLastEnd( rLastEnd ),
meClass( eClass )
{
}
@@ -740,8 +744,8 @@ namespace slideshow
if( eCurrElemClassification == meClass
nCurrElemCount == mnNodeIndex )
{
-maLastBegin = rCurrElemBegin;
-maLastEnd = rCurrElemEnd;
+mrLastBegin = rCurrElemBegin;
+mrLastEnd = rCurrElemEnd;
return false; // abort iteration, we've
// already found what we've been
@@ -751,20 +755,10 @@ namespace slideshow
return true; // keep on truckin'
}
-DrawShapeSubsetting::IndexClassificatorVector::const_iterator
getBeginElement() const
-{
-return maLastBegin;
-}
-
-DrawShapeSubsetting::IndexClassificatorVector::const_iterator
getEndElement() const
-{
-return maLastEnd;
-}
-
private:
sal_Int32
mnNodeIndex;
-DrawShapeSubsetting::IndexClassificatorVector::const_iterator
maLastBegin;
-DrawShapeSubsetting::IndexClassificatorVector::const_iterator
maLastEnd;
+DrawShapeSubsetting::IndexClassificatorVector::const_iterator
mrLastBegin;
+DrawShapeSubsetting::IndexClassificatorVector::const_iterator
mrLastEnd;
DrawShapeSubsetting::IndexClassificator
meClass;
};
@@ -789,17 +783,21 @@ namespace slideshow
const IndexClassificator eRequestedClass(
mapDocTreeNode( eNodeType ) );
+DrawShapeSubsetting::IndexClassificatorVector::const_iterator
aLastBegin(rEnd);
+DrawShapeSubsetting::IndexClassificatorVector::const_iterator
aLastEnd(rEnd);
+
// create a nth element functor for the requested class of
// actions, and nNodeIndex as the target index
FindNthElementFunctor aFunctor( nNodeIndex,
+aLastBegin,
+aLastEnd,
eRequestedClass );
// find given index in the given range
iterateActionClassifications( aFunctor, rBegin, rEnd );
return makeTreeNode( maActionClassVector.begin(),
- aFunctor.getBeginElement(),
- aFunctor.getEndElement(),
+ aLastBegin, aLastEnd,
eNodeType );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: moz/makefile.mk
moz/makefile.mk | 25 + 1 file changed, 9 insertions(+), 16 deletions(-) New commits: commit abb1bcf7bf11e596d93960bf8ca16cf671e6a2d0 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jan 11 00:44:08 2012 +0100 fix build on Mac - use SDK, map loader_path for nss-libs, remove HH cruft diff --git a/moz/makefile.mk b/moz/makefile.mk index 4487bc1..120c731 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -68,18 +68,6 @@ MOZILLA_CONFIGURE_FLAGS +=--disable-xft .EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS .ENDIF # $(SYSBASE)!= $(OS) == LINUX -.IF $(SYSBASE)!= $(OS) == MACOSX -PKGCONFIG_ROOT!:=$(ENV_ROOT)$/macports-1.7.0 -PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config -PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig -.EXPORT : PKG_CONFIG_PATH PKG_CONFIG -# hmm... rather gcc specific switches... -CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -L$(ENV_ROOT)/macports-1.7.0/lib -lmathCommon -LDFLAGS:=-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/lib/system -XLDOPTS:= -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -lmathCommon -.EXPORT : CFLAGS LDFLAGS XLDOPTS -.ENDIF # $(SYSBASE)!= $(OS) == MACOSX - # - pkg-config end --- MOZILLA_VERSION=1.1.14 @@ -156,6 +144,10 @@ MOZILLA_CONFIGURE_FLAGS += \ --with-nss-prefix=$(OUTDIR) \ --with-nspr-prefix=$(OUTDIR) +.IF $(OS)==MACOSX +# help the linker to resolve @loader_path to the solver (needed at least for 10.4 / XCode 2.5) +LDFLAGS+=$(foreach,name,$(echo nspr4 nss3 nssutil3 plc4 plds4) -Wl,-dylib_file,@loader_path/lib$(name).dylib:$(OUTDIR)/lib/lib$(name).dylib) +.ENDIF .ENDIF #disable profilelocking to share profile with mozilla @@ -166,11 +158,12 @@ MOZILLA_CONFIGURE_FLAGS += \ .IF $(GUI)==UNX .IF $(GUIBASE)==aqua MOZILLA_CONFIGURE_FLAGS+= \ ---with-macos-sdk=$(MACOSX_DEV_SDK) \ +--with-macos-sdk=$(MACOSX_SDK_PATH) \ --disable-glibtest \ --enable-macos-target=$(MACOSX_DEPLOYMENT_TARGET) \ --disable-libxul DEFAULT_MOZILLA_TOOLKIT=mac + .ELSE #We do not need mozilla ui, but libIDL version are decided by default toolkit. #default-toolkit=xlib need libIDL 0.68 @@ -284,7 +277,7 @@ LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71 .IF $(BUILD_MOZAB)== all: -@echo Never Build Mozilla. + @echo Never Build Mozilla. .ENDIF .INCLUDE : set_ext.mk @@ -352,12 +345,12 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack zip: \ $(MISC)$/CREATETARBALL -.IF $(GUIBASE)==aqua $(CREATE_UNIVERSAL_MAC_MOZ_ZIP)!= +.IF $(GUIBASE)==aqua MOZ_ARCH=$(eq,$(CPU),I i386 ppc) MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) force_clean : -@$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) + @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc svx/source writerfilter/inc writerfilter/Library_rtftok.mk writerfilter/source
svx/inc/svx/dialogs.hrc |1
svx/source/stbctrls/stbctrls.src |5 +++
writerfilter/Library_rtftok.mk|1
writerfilter/inc/rtftok/RTFDocument.hxx |4 ++
writerfilter/source/filter/RtfFilter.cxx |8 +
writerfilter/source/rtftok/rtfdocumentfactory.cxx |5 ++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx|8 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx|4 ++
writerfilter/source/rtftok/rtftokenizer.cxx | 30 --
writerfilter/source/rtftok/rtftokenizer.hxx |3 +-
10 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit 92c7b6733e55a6ab62bc231ecf0ffd5c0da7c8d2
Author: Miklos Vajna vmik...@frugalware.org
Date: Tue Jan 10 18:53:55 2012 +0100
fdo#38057 implement RTF import progressbar
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index a1038f1..4ef4ad1 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1175,5 +1175,6 @@
#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3)
#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4)
#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5)
+#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6)
#endif
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index c2e0999..dea916d 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -97,6 +97,11 @@ String RID_SVXSTR_DOC_MODIFIED_NO
Text [ en-US ] = The document has not been modified since the last save.;
};
+String RID_SVXSTR_DOC_LOAD
+{
+Text [ en-US ] = Loading document...;
+};
+
// PopupMenu -
Menu RID_SVXMNU_ZOOM
{
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 9ee5cde..3835a5d 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,rtftok,\
utl \
tl \
resourcemodel \
+ vcl \
$(gb_STDLIBS) \
))
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx
b/writerfilter/inc/rtftok/RTFDocument.hxx
index 72fe6bd..15b94eb 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -33,6 +33,7 @@
#include com/sun/star/io/XInputStream.hpp
#include com/sun/star/lang/XComponent.hpp
#include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/task/XStatusIndicator.hpp
namespace writerfilter {
namespace rtftok {
@@ -62,7 +63,8 @@ namespace writerfilter {
::com::sun::star::uno::Reference
::com::sun::star::uno::XComponentContext const xContext,
::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream const xInputStream,
::com::sun::star::uno::Reference
::com::sun::star::lang::XComponent const xDstDoc,
-::com::sun::star::uno::Reference
::com::sun::star::frame::XFrame const xFrame);
+::com::sun::star::uno::Reference
::com::sun::star::frame::XFrame const xFrame,
+::com::sun::star::uno::Reference
::com::sun::star::task::XStatusIndicator const xStatusIndicator);
};
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 0d0e929..2f549d0 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -35,6 +35,7 @@
#include dmapper/DomainMapper.hxx
#include rtftok/RTFDocument.hxx
#include com/sun/star/frame/XFrame.hpp
+#include com/sun/star/task/XStatusIndicator.hpp
using namespace ::rtl;
using namespace ::cppu;
@@ -88,14 +89,19 @@ sal_Bool RtfFilter::filter( const uno::Sequence
beans::PropertyValue aDescri
uno::Referenceframe::XFrame xFrame =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(),
uno::Referenceframe::XFrame());
+uno::Referencetask::XStatusIndicator xStatusIndicator =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(),
+uno::Referencetask::XStatusIndicator());
+
writerfilter::Stream::Pointer_t pStream(
new writerfilter::dmapper::DomainMapper(m_xContext,
xInputStream, m_xDstDoc, writerfilter::dmapper::DOCUMENT_RTF));
writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
-
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext,
xInputStream, m_xDstDoc, xFrame));
+
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext,
xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
pDocument-resolve(*pStream);
#ifdef DEBUG_IMPORT
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtftokenizer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b5d9e500ed8562448498cc1135b130123767134c
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Jan 11 02:06:35 2012 +0100
microopt, avoid unnecessary call to Tell()
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 415424b..6d4b5c2 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -87,8 +87,8 @@ int RTFTokenizer::resolveParse()
{
//SAL_INFO(writerfilter, OSL_THIS_FUNC : parsing character '
ch ');
-sal_uInt32 nCurrentPos = Strm().Tell();
-if (m_xStatusIndicator.is() nCurrentPos (nLastPos + nPercentSize))
+sal_uInt32 nCurrentPos;
+if (m_xStatusIndicator.is() (nCurrentPos = Strm().Tell())
(nLastPos + nPercentSize))
m_xStatusIndicator-setValue(nLastPos = nCurrentPos);
if (m_rImport.getGroup() 0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/view/viewdata.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a78260fb65c2542566215bb5bdd6060c164584ab
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 22:25:06 2012 -0500
fdo#44147: Sheet 0 is selected by default.
ScViewData's default ctor sets current sheet to 0, but its selected
sheet data didn't have it selected which meant that the two data
were out-of-sync when created. This affected entering data into cell
when the sheet was embedded (because no sheet was selected). In
reality at least one sheet is selected at all times.
The above bug was present before, but was masked by a hack in ScTabView
which always selected sheet 0 when activated. I removed that because
it was interfering with syncing the sheet selection data before and
after print preview. And removing that hack exposed this.
This commit is the right fix.
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 691b651..26c6346 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -322,6 +322,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell*
pViewSh ) :
bPagebreak ( false ),
bSelCtrlMouseClick( false )
{
+mpMarkData-SelectOneTable(0); // Sync with nTabNo.
SetGridMode ( sal_True );
SetSyntaxMode ( false );
@@ -368,6 +369,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell*
pViewSh ) :
ScViewData::ScViewData( const ScViewData rViewData ) :
maTabData( rViewData.maTabData ),
+mpMarkData(new ScMarkData(*rViewData.mpMarkData)),
pDocShell ( rViewData.pDocShell ),
pDoc( rViewData.pDoc ),
pView ( rViewData.pView ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewdata.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9b853ee45050b78a8e623269c3c7db5c63c2716e
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Jan 10 22:25:06 2012 -0500
fdo#44147: Sheet 0 is selected by default.
ScViewData's default ctor sets current sheet to 0, but its selected
sheet data didn't have it selected which meant that the two data
were out-of-sync when created. This affected entering data into cell
when the sheet was embedded (because no sheet was selected). In
reality at least one sheet is selected at all times.
The above bug was present before, but was masked by a hack in ScTabView
which always selected sheet 0 when activated. I removed that because
it was interfering with syncing the sheet selection data before and
after print preview. And removing that hack exposed this.
This commit is the right fix.
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 176a849..8a96403 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -323,6 +323,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell*
pViewSh ) :
bPagebreak ( false ),
bSelCtrlMouseClick( false )
{
+mpMarkData-SelectOneTable(0); // Sync with nTabNo.
SetGridMode ( sal_True );
SetSyntaxMode ( false );
@@ -369,6 +370,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell*
pViewSh ) :
ScViewData::ScViewData( const ScViewData rViewData ) :
maTabData( rViewData.maTabData ),
+mpMarkData(new ScMarkData(*rViewData.mpMarkData)),
pDocShell ( rViewData.pDocShell ),
pDoc( rViewData.pDoc ),
pView ( rViewData.pView ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 --- desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 39cfc4d8ad77700aefabaedde430693448a5f76f Author: Norbert n...@linux-uefb.site Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name diff --git a/Repository.mk b/Repository.mk index 3cc7a38..0724e43 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ +crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ +unopkg_bin \ +unopkg_com \ unopkgio \ )) else -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Helper_register_executables,OOO,\ - soffice_bin \ -unopkg_bin \ -)) -else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) -endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 456171d..8815432 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 464824f..c635c2b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/inc/macroass.hxx |1
cui/source/inc/macropg.hxx |1
cui/source/tabpages/autocdlg.cxx | 70 +++
3 files changed, 28 insertions(+), 44 deletions(-)
New commits:
commit 1681ee65f67cf1c382a34f7ea35fe118dc8603aa
Author: August Sodora aug...@gmail.com
Date: Tue Jan 10 23:55:12 2012 -0500
SvStringsDtor-std::vector
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a532f16..48eb935 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1468,19 +1468,16 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*,
pEdt)
struct StringsArrays
{
+std::vectorrtl::OUString aAbbrevStrings;
+std::vectorrtl::OUString aDoubleCapsStrings;
-SvStringsDtor aAbbrevStrings;
-SvStringsDtor aDoubleCapsStrings;
-
-StringsArrays() :
-aAbbrevStrings(5,5), aDoubleCapsStrings(5,5) {}
+StringsArrays() { }
};
-typedef StringsArrays* StringsArraysPtr;
-sal_Bool lcl_FindInArray(SvStringsDtor rStrings, const String rString)
+sal_Bool lcl_FindInArray(std::vectorrtl::OUString rStrings, const String
rString)
{
-for(sal_uInt16 i = 0; i rStrings.Count(); i++)
-if(rString == *rStrings.GetObject(i))
+for(std::vectorrtl::OUString::iterator i = rStrings.begin(); i !=
rStrings.end(); ++i)
+if((*i).equals(rString))
return sal_True;
return sal_False;
}
@@ -1590,12 +1587,12 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet )
if( !lcl_FindInArray(pArrays-aDoubleCapsStrings,
*pString))
pWrdList-DeleteAndDestroy( i );
}
-nCount = pArrays-aDoubleCapsStrings.Count();
-for( i = 0; i nCount; ++i )
+
+for(std::vectorrtl::OUString::iterator it =
pArrays-aDoubleCapsStrings.begin(); it != pArrays-aDoubleCapsStrings.end();
++i)
{
-String* pEntry = new String(
*pArrays-aDoubleCapsStrings.GetObject( i ) );
-if( !pWrdList-Insert( pEntry ))
-delete pEntry;
+String* s = new String(*it);
+if(!pWrdList-Insert(s))
+delete s;
}
pAutoCorrect-SaveWrdSttExceptList(eCurLang);
}
@@ -1612,13 +1609,14 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet )
if( !lcl_FindInArray(pArrays-aAbbrevStrings, *pString))
pCplList-DeleteAndDestroy( i );
}
-nCount = pArrays-aAbbrevStrings.Count();
-for( i = 0; i nCount; ++i )
+
+for(std::vectorrtl::OUString::iterator it =
pArrays-aAbbrevStrings.begin(); it != pArrays-aAbbrevStrings.end(); ++it)
{
-String* pEntry = new String(
*pArrays-aAbbrevStrings.GetObject(i) );
-if( !pCplList-Insert( pEntry ))
-delete pEntry;
+String* s = new String(*it);
+if(!pCplList-Insert(s))
+delete s;
}
+
pAutoCorrect-SaveCplSttExceptList(eCurLang);
}
}
@@ -1702,14 +1700,12 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
lcl_ClearTable(aStringsTable);
else
{
-StringsArraysPtr pArrays = 0;
+StringsArrays* pArrays = NULL;
if(aStringsTable.IsKeyValid(eOldLanguage))
{
pArrays = aStringsTable.Seek(sal_uLong(eOldLanguage));
-pArrays-aAbbrevStrings.DeleteAndDestroy(
-0, pArrays-aAbbrevStrings.Count());
-pArrays-aDoubleCapsStrings.DeleteAndDestroy(
-0, pArrays-aDoubleCapsStrings.Count());
+pArrays-aAbbrevStrings.clear();
+pArrays-aDoubleCapsStrings.clear();
}
else
{
@@ -1719,16 +1715,10 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
sal_uInt16 i;
for(i = 0; i aAbbrevLB.GetEntryCount(); i++)
-{
-pArrays-aAbbrevStrings.Insert(
-new String(aAbbrevLB.GetEntry(i)), i);
+
pArrays-aAbbrevStrings.push_back(rtl::OUString(aAbbrevLB.GetEntry(i)));
-}
for(i = 0; i aDoubleCapsLB.GetEntryCount(); i++)
-{
-pArrays-aDoubleCapsStrings.Insert(
-new String(aDoubleCapsLB.GetEntry(i)), i);
-}
+
pArrays-aDoubleCapsStrings.push_back(rtl::OUString(aDoubleCapsLB.GetEntry(i)));
}
aDoubleCapsLB.Clear();
aAbbrevLB.Clear();
@@ -1738,16 +1728,12 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
if(aStringsTable.IsKeyValid(eLang))
{
-StringsArraysPtr pArrays =
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtftokenizer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5a180fd905e3e8f7b7d16fa094d47c64577130cb
Author: August Sodora aug...@gmail.com
Date: Wed Jan 11 00:15:51 2012 -0500
Fix MacOSX build
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 6d4b5c2..d6dc3ca 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -65,8 +65,8 @@ int RTFTokenizer::resolveParse()
int ret;
// for hex chars
int b = 0, count = 2;
-sal_uInt32 nPercentSize;
-sal_uInt32 nLastPos;
+sal_uInt32 nPercentSize = 0;
+sal_uInt32 nLastPos = 0;
if (m_xStatusIndicator.is())
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_sch binfilter/bf_sw
binfilter/bf_sch/source/core/sch_globfunc.cxx |4 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 539d9db35d08904e03366c51105f60385f84
Author: David Tardon dtar...@redhat.com
Date: Tue Jan 10 19:32:51 2012 +0100
fix for gcc 4.7/C++11: these are not string literal operators
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx
b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 6a81bf1..ac87608 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -1193,7 +1193,7 @@ namespace binfilter {
/*N*/ const USHORT* pRanges = rSet.GetRanges();
/*N*/ for( long n = 0; pRanges[ n ] n32; n+=2 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), [%SAL_PRIdINT32;
%SAL_PRIdINT32] , (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), [% SAL_PRIdINT32 ; %
SAL_PRIdINT32 ] , (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
/*N*/ }
/*N*/
@@ -1219,7 +1219,7 @@ namespace binfilter {
/*N*/ nCns++;
/*N*/ if( nCnt 100 )
/*N*/ {
-/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), %SAL_PRIdINT32,
, (sal_uInt32) nWhich );
+/*N*/ snprintf( pSmallBuf, sizeof(pSmallBuf), % SAL_PRIdINT32
, , (sal_uInt32) nWhich );
/*N*/ strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1
);
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6548a85..3da5855 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1646,7 +1646,7 @@ void Sw3StringPool::LoadOld( SvStream r )
/*N*/ if( pCrypter )
/*N*/ {
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf),
%08SAL_PRIxUINT32%08SAL_PRIxUINT32, nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), %08 SAL_PRIxUINT32 %08
SAL_PRIxUINT32, nDate, nTime );
/*?*/ rtl::OStringBuffer aTest( buf );
/*?*/ pCrypter-Encrypt( aTest );
/*?*/ return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
@@ -1664,7 +1664,7 @@ void Sw3StringPool::LoadOld( SvStream r )
/*N*/ {
/*?*/ pCrypter = new Crypter( pRoot-GetKey() );
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf),
%08SAL_PRIxUINT32%08SAL_PRIxUINT32, nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), %08 SAL_PRIxUINT32 %08
SAL_PRIxUINT32, nDate, nTime );
/*?*/ rtl::OStringBuffer aTest( buf );
/*?*/ pCrypter-Encrypt( aTest );
/*?*/ memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/source
framework/source/uielement/toolbarmanager.cxx |3 ++-
framework/source/uielement/toolbarmerger.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit de4dddcd2bf799dae7c10e9c9ac8a81fdcfbe19e
Author: David Tardon dtar...@redhat.com
Date: Tue Jan 10 13:31:33 2012 +0100
workaround internal compiler error with gcc 4.7
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 3c2896e..df50488 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1379,7 +1379,8 @@ void ToolBarManager::FillToolbar( const Reference
XIndexAccess rItemContaine
{
aCmdInfo.nId = nId;
aCmdInfo.nWidth = nWidth;
-m_aCommandMap.insert( CommandToInfoMap::value_type(
aCommandURL, aCmdInfo ));
+const CommandToInfoMap::value_type aValue(
aCommandURL, aCmdInfo );
+m_aCommandMap.insert( aValue );
}
else
{
diff --git a/framework/source/uielement/toolbarmerger.cxx
b/framework/source/uielement/toolbarmerger.cxx
index 7e0b39f..a085a6a 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -516,7 +516,8 @@ bool ToolBarMerger::MergeItems(
{
CommandInfo aCmdInfo;
aCmdInfo.nId = rItemId;
-rCommandMap.insert( CommandToInfoMap::value_type(
rItem.aCommandURL, aCmdInfo ));
+const CommandToInfoMap::value_type aValue(
rItem.aCommandURL, aCmdInfo );
+rCommandMap.insert( aValue );
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bridges/test xmlsecurity/source
bridges/test/inter_libs_exc/inter.cxx|4 ++--
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9dec6475aa7057d8544d8f8a3c716c90fe7f9e65
Author: David Tardon dtar...@redhat.com
Date: Wed Jan 11 07:48:43 2012 +0100
fix for gcc 4.7/C++11: these are not string literal operators
diff --git a/bridges/test/inter_libs_exc/inter.cxx
b/bridges/test/inter_libs_exc/inter.cxx
index 1eb7bb8..fe4a246 100644
--- a/bridges/test/inter_libs_exc/inter.cxx
+++ b/bridges/test/inter_libs_exc/inter.cxx
@@ -46,10 +46,10 @@ extern C int main( int argc, char const * argv [] )
#define SAL_DLLPREFIX
#endif
Module mod_starter(
-OUSTR(SAL_DLLPREFIXstarterSAL_DLLEXTENSION),
+OUSTR(SAL_DLLPREFIX starter SAL_DLLEXTENSION),
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
Module mod_thrower(
-OUSTR(SAL_DLLPREFIXthrowerSAL_DLLEXTENSION),
+OUSTR(SAL_DLLPREFIX thrower SAL_DLLEXTENSION),
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
typedef t_throws_exc (SAL_CALL * t_get_thrower)();
commit 0669fdb4874f8169ce1e49f3ae946c87ce1478ce
Author: David Tardon dtar...@redhat.com
Date: Wed Jan 11 07:47:38 2012 +0100
fix for gcc 4.7/C++11: this is not string literal operator
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index a1e5977..0e2553d 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -297,7 +297,7 @@ bool nsscrypto_initialize( const css::uno::Reference
css::lang::XMultiServiceFa
deleteRootsModule();
#if defined SYSTEM_MOZILLA
-OUString
rootModule(RTL_CONSTASCII_USTRINGPARAM(libnssckbiSAL_DLLEXTENSION));
+OUString rootModule(RTL_CONSTASCII_USTRINGPARAM(libnssckbi
SAL_DLLEXTENSION));
#else
OUString
rootModule(RTL_CONSTASCII_USTRINGPARAM(${LO_LIB_DIR}/libnssckbi
SAL_DLLEXTENSION));
#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/doctempl.hxx |3
sfx2/source/doc/doctdlg.cxx |5
sfx2/source/doc/doctempl.cxx | 200 ++-
sfx2/source/doc/doctemplates.cxx |3
sfx2/source/doc/docvor.cxx |8 -
sfx2/source/doc/new.cxx |5
6 files changed, 77 insertions(+), 147 deletions(-)
New commits:
commit 529d9b99b2eae8d42fe839cfa258477dad665280
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 10 16:38:24 2012 +0100
Hide bogus Untitled already exists errors...
...when adding multiple new template regions in a row in
SfxOrganizeDlg_Impl.
(cherry picked from commit d6b26b85cf8ca9d925b13ee3379516dabba61f90)
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 5eb55b5..ad5a9e2 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -872,7 +872,8 @@ sal_Bool
SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU
INetURLObject aDirPath( aPath );
Content aParent;
- if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ),
maCmdEnv, aParent ) )
+uno::Reference XCommandEnvironment aQuietEnv;
+ if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ),
aQuietEnv, aParent ) )
{
for ( sal_Int32 nInd = 0; nInd 32000; nInd++ )
{
commit 6b5969cee2495b760e27b896ec4f0bbd61239e23
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 10 16:04:58 2012 +0100
fdo#43532 Partial revert of ...template names appear... correct word order
Sorting the sfx2-based list boxes does not work as SfxDocumentTemplates
uses a
different collating order (plain Unicode code points) than the list boxes,
so
that e.g. en-US comes last in SfxDocumentTemplates but not in the list
boxes.
Even with that fixed, insertions into SfxOrganizeDlg_Impl would still not
work
right.
This reverts the sfx2 parts of commits
50b7733fa41879a62d35cab64da59b109e1a8502
and df59068902b294b7b344af0c20da196cc64aaced.
(cherry picked from commit 2c4d00f509bbb8333124d443f4cbfa085216a38b)
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index b60ac95..df1d9f0 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -93,9 +93,6 @@ public:
int nCount,
const ::rtl::OUString rString);
-voidEnableRegionSorting(bool isRegionSortingEnabled =
true);
-voidEnableTemplateSorting(bool isTemplateSortingEnabled =
true);
-
sal_BoolCopy(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
sal_uInt16 nSourceRegion,
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index c0f83a0..2b61618 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -73,8 +73,6 @@ SfxDocumentTemplateDlg::SfxDocumentTemplateDlg( Window *
pParent, SfxDocumentTem
aNameEd.SetModifyHdl(LINK(this, SfxDocumentTemplateDlg, NameModify));
aOkBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OkHdl));
aEditBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
-aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
-aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
Init();
}
@@ -109,9 +107,6 @@ void SfxDocumentTemplateDlg::Init()
if(!pTemplates-IsConstructed())
pTemplates-Construct();
-pTemplates-EnableRegionSorting();
-pTemplates-EnableTemplateSorting();
-
const sal_uInt16 nCount = pTemplates-GetRegionCount();
for(sal_uInt16 i = 0; i nCount; ++i)
aRegionLb.InsertEntry(pTemplates-GetFullRegionName(i));
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index d990d25..3f86df0 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -37,6 +37,7 @@
#include vcl/settings.hxx
#include unotools/localedatawrapper.hxx
#include unotools/pathoptions.hxx
+#include tools/resary.hxx
#include tools/string.hxx
#include tools/urlobj.hxx
#include svtools/ehdl.hxx
@@ -101,7 +102,6 @@ using namespace ::ucbhelper;
#include unotools/ucbhelper.hxx
#include vector
-#include algorithm
using ::std::vector;
using ::std::advance;
@@ -170,13 +170,6 @@ public:
sal_BoolDeleteObjectShell();
};
-class TemplateEntryCompare
-{
-public:
-bool operator()( DocTempl_EntryData_Impl* pA, DocTempl_EntryData_Impl* pB
) const
-{ return 0 pA-Compare( pB-GetTitle() ); }
-};
-
}
using namespace ::DocTempl;
@@ -190,7 +183,6 @@ class RegionData_Impl
OUStringmaTitle;
OUStringmaOwnURL;
OUStringmaTargetURL;
-boolmbSortingEnabled;
private:
size_t GetEntryPos( const OUString rTitle,
@@ -221,20 +213,11 @@
[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/doctempl.hxx |3
sfx2/source/doc/doctdlg.cxx |5
sfx2/source/doc/doctempl.cxx | 200 ++-
sfx2/source/doc/doctemplates.cxx |3
sfx2/source/doc/docvor.cxx |8 -
sfx2/source/doc/new.cxx |5
6 files changed, 77 insertions(+), 147 deletions(-)
New commits:
commit d506bc43f6982b33e42b3449cad059075f8faca1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 10 16:38:24 2012 +0100
Hide bogus Untitled already exists errors...
...when adding multiple new template regions in a row in
SfxOrganizeDlg_Impl.
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index dcaaeca..fce978c 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -873,7 +873,8 @@ sal_Bool
SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU
INetURLObject aDirPath( aPath );
Content aParent;
- if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ),
maCmdEnv, aParent ) )
+uno::Reference XCommandEnvironment aQuietEnv;
+ if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ),
aQuietEnv, aParent ) )
{
for ( sal_Int32 nInd = 0; nInd 32000; nInd++ )
{
commit 4a8e458b45dd063a82825e252366f678aec23921
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 10 16:04:58 2012 +0100
fdo#43532 Partial revert of ...template names appear... correct word order
Sorting the sfx2-based list boxes does not work as SfxDocumentTemplates
uses a
different collating order (plain Unicode code points) than the list boxes,
so
that e.g. en-US comes last in SfxDocumentTemplates but not in the list
boxes.
Even with that fixed, insertions into SfxOrganizeDlg_Impl would still not
work
right.
This reverts the sfx2 parts of commits
50b7733fa41879a62d35cab64da59b109e1a8502
and df59068902b294b7b344af0c20da196cc64aaced.
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index b60ac95..df1d9f0 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -93,9 +93,6 @@ public:
int nCount,
const ::rtl::OUString rString);
-voidEnableRegionSorting(bool isRegionSortingEnabled =
true);
-voidEnableTemplateSorting(bool isTemplateSortingEnabled =
true);
-
sal_BoolCopy(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
sal_uInt16 nSourceRegion,
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index c0f83a0..2b61618 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -73,8 +73,6 @@ SfxDocumentTemplateDlg::SfxDocumentTemplateDlg( Window *
pParent, SfxDocumentTem
aNameEd.SetModifyHdl(LINK(this, SfxDocumentTemplateDlg, NameModify));
aOkBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OkHdl));
aEditBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
-aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
-aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
Init();
}
@@ -109,9 +107,6 @@ void SfxDocumentTemplateDlg::Init()
if(!pTemplates-IsConstructed())
pTemplates-Construct();
-pTemplates-EnableRegionSorting();
-pTemplates-EnableTemplateSorting();
-
const sal_uInt16 nCount = pTemplates-GetRegionCount();
for(sal_uInt16 i = 0; i nCount; ++i)
aRegionLb.InsertEntry(pTemplates-GetFullRegionName(i));
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 8a194f8..d3878d9 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -36,6 +36,7 @@
#include vcl/settings.hxx
#include unotools/localedatawrapper.hxx
#include unotools/pathoptions.hxx
+#include tools/resary.hxx
#include tools/string.hxx
#include tools/urlobj.hxx
#include svtools/ehdl.hxx
@@ -100,7 +101,6 @@ using namespace ::ucbhelper;
#include unotools/ucbhelper.hxx
#include vector
-#include algorithm
using ::std::vector;
using ::std::advance;
@@ -169,13 +169,6 @@ public:
sal_BoolDeleteObjectShell();
};
-class TemplateEntryCompare
-{
-public:
-bool operator()( DocTempl_EntryData_Impl* pA, DocTempl_EntryData_Impl* pB
) const
-{ return 0 pA-Compare( pB-GetTitle() ); }
-};
-
}
using namespace ::DocTempl;
@@ -189,7 +182,6 @@ class RegionData_Impl
OUStringmaTitle;
OUStringmaOwnURL;
OUStringmaTargetURL;
-boolmbSortingEnabled;
private:
size_t GetEntryPos( const OUString rTitle,
@@ -220,20 +212,11 @@ public:
size_t *pPos = NULL );
voidDeleteEntry( size_t nIndex );
-void
