[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sw/source
sfx2/inc/sfx2/tabdlg.hxx | 10 +++---
sfx2/source/dialog/tabdlg.cxx | 16 +---
sw/source/ui/dialog/swdlgfact.cxx |2 +-
3 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit b7aa16fe0da53001e056ad347ac5e10855376365
Author: Caolán McNamara
Date: Wed Jan 16 23:32:54 2013 +
bInOK is unused, remove it
Change-Id: I133d7d2e37d267afe521d6641582dc88f9054a41
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 932e4f2..130abfe 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -162,7 +162,6 @@ struct TabDlg_Impl
{
sal_BoolbModified : 1,
bModal : 1,
-bInOK : 1,
bHideResetBtn : 1;
SfxTabDlgData_Impl* pData;
@@ -172,7 +171,6 @@ struct TabDlg_Impl
bModified ( sal_False ),
bModal ( sal_True ),
-bInOK ( sal_False ),
bHideResetBtn ( sal_False ),
pData ( new SfxTabDlgData_Impl( nCnt ) ),
pController ( NULL )
@@ -1073,8 +1071,6 @@ short SfxTabDialog::Ok()
{
SavePosAndId(); //See fdo#38828 "Apply" resetting window position
-pImpl->bInOK = sal_True;
-
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
@@ -1173,8 +1169,6 @@ IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
*/
{
-pImpl->bInOK = sal_True;
-
if (PrepareLeaveCurrentPage())
{
if ( pImpl->bModal )
commit 8fd85527981e3a6a915192aaea6f1595ea9f037c
Author: Caolán McNamara
Date: Wed Jan 16 23:26:10 2013 +
Resolves: fdo#58998 insert section applied twice
regression since 0157f0b1ba364f7f9af2aacd1be9fbb5ddec2b4d
my belief was that OK_Impl was only called in one
place, in sw/source/ui/fmtui/tmpdlg.cxx, so I
merged the use there into OK_Impl, but of course
there was another use in sfx2/source/dialog/tabdlg.cxx
Given that OK_Impl only called PrepareLeaveCurrentPage originally...
a) replace OK_Impl in sfx2/source/dialog/tabdlg.cxx
with PrepareLeaveCurrentPage, a no-op from the original state.
b) add an Apply method that does what I want, i.e.
call ok without closing the dialog, so we can retain
the fix of fdo#38606 to have "apply" immediately
apply the effect of pressing "ok" without closing
and reopening the dialog
Change-Id: I57e2e41c07ab9bf89ada98d1b9c3336db3493f19
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 69c7d89..d9593c0 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -219,13 +219,9 @@ public:
voidSetApplyHandler(const Link& _rHdl);
SAL_DLLPRIVATE void Start_Impl();
-bool OK_Impl()
-{
-bool bRet = PrepareLeaveCurrentPage();
-if (bRet)
-Ok();
-return bRet;
-}
+
+//calls Ok without closing dialog
+bool Apply();
};
namespace sfx { class ItemConnectionBase; }
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 68d001d..932e4f2 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1175,7 +1175,7 @@ IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
{
pImpl->bInOK = sal_True;
-if ( OK_Impl() )
+if (PrepareLeaveCurrentPage())
{
if ( pImpl->bModal )
EndDialog( Ok() );
@@ -1188,6 +1188,14 @@ IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
return 0;
}
+bool SfxTabDialog::Apply()
+{
+bool bApplied = false;
+if (PrepareLeaveCurrentPage())
+ bApplied = (Ok() == RET_OK);
+return bApplied;
+}
+
// ---
bool SfxTabDialog::PrepareLeaveCurrentPage()
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 5f833a3..dd84f23 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -159,7 +159,7 @@ String AbstractTabDialog_Impl::GetText() const
IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl)
{
-if (pDlg->OK_Impl())
+if (pDlg->Apply())
m_aHandler.Call(NULL);
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sw/source vcl/inc vcl/source
sfx2/inc/sfx2/sfxhelp.hxx| 36 ++---
sfx2/source/appl/newhelp.cxx | 40 ++
sfx2/source/appl/newhelp.hxx |2
sfx2/source/appl/sfxhelp.cxx | 236 +++
sw/source/filter/ww8/ww8par2.cxx |1
vcl/inc/helpwin.hxx | 14 +-
vcl/inc/vcl/help.hxx | 32 ++---
vcl/source/app/help.cxx | 47 ---
8 files changed, 200 insertions(+), 208 deletions(-)
New commits:
commit b966a09c2da9441961c93c44be556399575db849
Author: Caolán McNamara
Date: Mon Oct 1 23:57:06 2012 +0100
Resolves: fdo#54862 extra ++n causing merged cells to be skipped
commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile
of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f
but didn't revert the ++n of that commit, leading to merge groups
getting skipped
Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a4336b9..83db83e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2752,7 +2752,6 @@ void WW8TabDesc::FinishSwTable()
nRowSpan :
((-1) * (nRowSpan - n));
pCurrentBox->setRowSpan( nRowSpanSet );
-++n;
}
}
}
commit d67dff5719b32c17f4bf02990de5d7a772db484c
Author: Caolán McNamara
Date: Mon Oct 1 11:03:34 2012 +0100
XubString->OUString
Change-Id: Id64cdd70c2877ff71c5bc90286fab6b3d8ab7ad4
diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index 12c58c2..9de00f0 100644
--- a/sfx2/inc/sfx2/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.hxx
@@ -19,45 +19,45 @@
#ifndef _SFX_HELP_HXX
#define _SFX_HELP_HXX
+#include
#include "sal/config.h"
#include "sfx2/dllapi.h"
#include "sal/types.h"
#include
-#include
class SfxHelp_Impl;
class SfxFrame;
class SFX2_DLLPUBLIC SfxHelp : public Help
{
-String aTicket;// for Plugins
-String aUser;
-String aLanguageStr;
-String aCountryStr;
+OUStringaTicket;// for Plugins
+OUStringaUser;
+OUStringaLanguageStr;
+OUStringaCountryStr;
sal_BoolbIsDebug;
SfxHelp_Impl* pImp;
private:
-SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window*
pWindow, const String& rKeyword );
-SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord );
-SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window*
pWindow );
-SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
-SAL_DLLPRIVATE String GetHelpModuleName_Impl();
-SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const
String& rModuleName );
+SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window*
pWindow, const OUString& rKeyword );
+SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const OUString& rKeyWord );
+SAL_DLLPRIVATE virtual sal_Bool Start( const OUString& rURL, const Window*
pWindow );
+SAL_DLLPRIVATE virtual void OpenHelpAgent( const OString& sHelpId );
+SAL_DLLPRIVATE OUString GetHelpModuleName_Impl();
+SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL,
const OUString& rModuleName );
public:
SfxHelp();
~SfxHelp();
-inline void SetTicket( const String& rTicket ) { aTicket =
rTicket; }
-inline void SetUser( const String& rUser ) { aUser =
rUser; }
+inline void SetTicket( const OUString& rTicket ) { aTicket =
rTicket; }
+inline void SetUser( const OUString& rUser ) { aUser =
rUser; }
-virtual XubString GetHelpText( const String&, const Window* pWindow
);
+virtual OUStringGetHelpText( const OUString&, const Window*
pWindow );
-static String CreateHelpURL( const String& aCommandURL, const
String& rModuleName );
+static OUString CreateHelpURL( const OUString& aCommandURL, const
OUString& rModuleName );
using Help::OpenHelpAgent;
-static void OpenHelpAgent( SfxFrame* pFrame, const
rtl::OString& sHelpId );
-static String GetDefaultHelpModule();
-static ::rtl::OUString GetCurrentModuleIdentifier();
+static void OpenHelpAgent( SfxFrame* pFrame, const OString&
sHelpId );
+static OUString GetDefaultHelpModule();
+static OUString GetCurrentModuleIdentifier();
};
#endif // #ifndef _SFX_HELP_HXX
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index f6da0ca..8e360c6 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -627,14 +627,11 @@ void IndexTabPage_Impl::InitializeIndex()
try
{
[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sw/source
sfx2/inc/sfx2/templateviewitem.hxx |3 ++-
sfx2/inc/sfx2/thumbnailviewitem.hxx |3 ++-
sfx2/source/control/templatelocalview.cxx|2 +-
sfx2/source/control/templateviewitem.cxx |8 ++--
sfx2/source/control/thumbnailview.cxx|2 +-
sfx2/source/control/thumbnailviewitem.cxx|6 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 17 -
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
8 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit c1c2688912e769dfd7654e11e87dae380a8ce1eb
Author: Cédric Bosdonnat
Date: Tue Aug 21 07:02:46 2012 +0200
fdo#53175: Fixed the end of hyperlinks
This fixes the end of hyperlinks appearing after field ends (while the
start of hyperlink is after field start too).
Change-Id: If21b8973baaca183e0103e3a70ed98b99aa59392
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cbca1b6..71c1915 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -559,6 +559,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer->startElementNS( XML_w, XML_hyperlink, xAttrList );
m_pHyperlinkAttrList = NULL;
+m_startedHyperlink = true;
}
DoWriteBookmarks( );
@@ -575,16 +576,21 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath();
+if ( m_closeHyperlinkInThisRun )
+{
+if ( m_startedHyperlink )
+{
+m_pSerializer->endElementNS( XML_w, XML_hyperlink );
+m_startedHyperlink = false;
+}
+m_closeHyperlinkInThisRun = false;
+}
+
while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
m_Fields.erase( m_Fields.begin( ) );
}
-if ( m_closeHyperlinkInThisRun )
-{
-m_pSerializer->endElementNS( XML_w, XML_hyperlink );
-m_closeHyperlinkInThisRun = false;
-}
// if there is some redlining in the document, output it
EndRedline();
@@ -4401,6 +4407,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
&rExport, FSHelperPtr pSeri
m_pParentFrame( NULL ),
m_closeHyperlinkInThisRun( false ),
m_closeHyperlinkInPreviousRun( false ),
+ m_startedHyperlink( false ),
m_postponedGraphic( NULL ),
m_postponedMath( NULL ),
m_postitFieldsMaxId( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 24b6836..3a9c7cb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -592,6 +592,7 @@ private:
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
+bool m_startedHyperlink;
struct PostponedGraphic
{
commit a873be622198c8a9ac59452e64d919d363e32d72
Author: Cédric Bosdonnat
Date: Tue Aug 21 06:24:19 2012 +0200
template manager: setFontAttribute on TextLayouterDevice is needed
or you could have some weird values initialised much earlier (remember,
that TextLayouterDevice shares its device)
Change-Id: Ia8e44e578dc1bff6bdc97a3007db51e20692593d
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx
b/sfx2/inc/sfx2/templateviewitem.hxx
index a64b15d..992af40 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/sfx2/templateviewitem.hxx
@@ -41,7 +41,8 @@ public:
const rtl::OUString& getSubTitle () const { return maSubTitle; }
virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
- const long nPadding, sal_uInt32
nMaxTextLenght);
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index aab7fe3..91a6884 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -104,7 +104,8 @@ public:
const Rectangle& getDrawArea () const { return maDrawArea; }
virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
- const long nPadding, sal_uInt32
nMaxTextLenght);
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
const Point& getTextPos () const { return maTextPos; }
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 79e382f..b230260 100644
--- a/sfx2/source/control/templa
