[Libreoffice-commits] .: framework/source
framework/source/classes/menumanager.cxx |9 + 1 file changed, 1 insertion(+), 8 deletions(-) New commits: commit ef9620df989cd1e3ab9cf2e289b035231cca4d39 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Apr 4 17:59:46 2012 +0200 remove an assert from an attempt to silence clang's false warning http://llvm.org/bugs/show_bug.cgi?id=12459 It is not clear to me why the explicit cast was there in the first place, but removing it probably can't make the situation worse than aborting incorrectly. diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 202b7eb..40f329c 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -146,14 +146,7 @@ MenuManager::MenuManager( m_xFrame= rFrame; m_bInitialized = sal_False; m_bIsBookmarkMenu = sal_False; -#ifdef LIBO_WERROR -// Wtf? Clang says: call to pure virtual member function -// 'acquire'; overrides of 'acquire' in subclasses are not -// available in the constructor of 'XInterface' -assert(!Call to pure virtual member function); -#else -SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )-acquire(); -#endif +acquire(); const StyleSettings rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/services/backingwindow.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4e24d472f693c458b17d2ba1fb6c883aaf9c3b27 Author: Ivan Timofeev timofeev@gmail.com Date: Tue Apr 3 20:40:14 2012 +0400 fix the initial font size in the Start Center Recover the code that was for some reason removed in commit 78e8d5f0d62f910b8561a1c4fd7ebd8ae4cfb9f8. diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index d930f77..ca0e9e7 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -239,6 +239,9 @@ BackingWindow::BackingWindow( Window* i_pParent ) : maButtonImageSize.Width() += 12; maButtonImageSize.Height() += 12; +// set a slighly larger font than normal labels on the texts +maTextFont.SetSize( Size( 0, 11 ) ); +maTextFont.SetWeight( WEIGHT_NORMAL ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/services/desktop.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8550f6a66af279a34731a2d7921fb63550e463b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Mar 5 09:21:38 2012 +0100
add a space
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 3d164f0..8a03aa3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
bool SAL_CALL Desktop::terminateQuickstarterToo()
throw( css::uno::RuntimeException )
{
-QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
return terminate();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/services/desktop.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f3d78616dfc0805ff31038e00148e115d409ef9a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Mar 5 08:50:10 2012 +0100
lp#562027: actually give the quickstart suppressor a scope
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 6c63aea..3d164f0 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
bool SAL_CALL Desktop::terminateQuickstarterToo()
throw( css::uno::RuntimeException )
{
-QuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
return terminate();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source l10ntools/source oox/source
framework/source/dispatch/closedispatcher.cxx |2
framework/source/fwe/helper/titlehelper.cxx |6 -
framework/source/layoutmanager/layoutmanager.cxx| 83 ++--
framework/source/layoutmanager/toolbarlayoutmanager.cxx |3
l10ntools/source/tagtest.cxx| 10 -
oox/source/drawingml/chart/objectformatter.cxx |2
oox/source/drawingml/textparagraphproperties.cxx| 18 +--
oox/source/dump/dumperbase.cxx |2
oox/source/dump/pptxdumper.cxx | 34 +++---
oox/source/dump/xlsbdumper.cxx | 34 +++---
oox/source/export/drawingml.cxx |4
oox/source/mathml/importutils.cxx | 15 +-
12 files changed, 123 insertions(+), 90 deletions(-)
New commits:
commit 96cb767123c9e8f5db197454b4da02c8f7583d2b
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sun Feb 19 23:27:29 2012 +0900
Prefer equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(...))
to equalsIgnoreAsciiCaseAscii(...)
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index b595da7..2a8d20b 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -605,7 +605,7 @@ void CloseDispatcher::implts_notifyResultListener(const
css::uno::Reference css
css::uno::Reference css::frame::XFrame
CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference
css::frame::XFrame xFrame ,
const ::rtl::OUString sTarget)
{
-if (sTarget.equalsIgnoreAsciiCaseAscii(_self))
+if
(sTarget.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(_self)))
return xFrame;
OSL_ENSURE(sTarget.isEmpty(), CloseDispatch used for unexpected target.
Magic things will happen now .-));
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 07ff57d..c963a2b 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -197,8 +197,8 @@ void SAL_CALL TitleHelper::titleChanged(const
css::frame::TitleChangedEvent aEv
void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject
aEvent)
throw (css::uno::RuntimeException)
{
-if ( ! aEvent.EventName.equalsIgnoreAsciiCaseAscii (OnSaveAsDone)
- ! aEvent.EventName.equalsIgnoreAsciiCaseAscii (OnTitleChanged))
+if ( !
aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(OnSaveAsDone))
+ !
aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(OnTitleChanged)))
return;
// SYNCHRONIZED -
@@ -211,7 +211,7 @@ void SAL_CALL TitleHelper::notifyEvent(const
css::document::EventObject aEvent)
if (
aEvent.Source != xOwner ||
- (aEvent.EventName.equalsIgnoreAsciiCaseAscii (OnTitleChanged)
!xOwner.is())
+
(aEvent.EventName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(OnTitleChanged))
!xOwner.is())
)
{
return;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 0020a2e..e25d74b 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -490,11 +490,15 @@ uno::Reference ui::XUIElement
LayoutManager::implts_findElement( const rtl::O
::rtl::OUString aElementName;
parseResourceURL( aName, aElementType, aElementName );
-if ( aElementType.equalsIgnoreAsciiCaseAscii( menubar )
aElementName.equalsIgnoreAsciiCaseAscii( menubar ))
+if (
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(menubar))
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(menubar))
)
return m_xMenuBar;
-else if (( aElementType.equalsIgnoreAsciiCaseAscii( statusbar )
aElementName.equalsIgnoreAsciiCaseAscii( statusbar )) || (
m_aStatusBarElement.m_aName == aName ))
+else if ((
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(statusbar))
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(statusbar))
) ||
+ ( m_aStatusBarElement.m_aName == aName ))
return m_aStatusBarElement.m_xUIElement;
-else if ( aElementType.equalsIgnoreAsciiCaseAscii( progressbar )
aElementName.equalsIgnoreAsciiCaseAscii( progressbar ))
+else if (
aElementType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(progressbar))
+
aElementName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(progressbar))
)
return m_aProgressBarElement.m_xUIElement;
return uno::Reference ui::XUIElement ();
@@ -1494,7 +1498,8 @@ throw
[Libreoffice-commits] .: framework/source svx/source
framework/source/accelerators/globalacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/moduleacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/presethandler.cxx | 12
+-
framework/source/services/autorecovery.cxx | 10
svx/source/unodraw/unoshcol.cxx |4 +--
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit f58c49b39a7c6a8490033360f78768ee0a26f167
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 2 22:53:48 2012 +0100
Some cppcheck cleaning
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 84da269..c5853f8 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -119,8 +119,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9c3fb8f..7100685 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -153,8 +153,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index d276b48..b68fdc4 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -501,8 +501,8 @@ void PresetHandler::connectToResource(
PresetHandler::EConfigType
xUser = m_lDocumentStorages.openPath(sRelPathUser , eUserMode
);
xShare = xUser;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xShare.clear(); xUser.clear(); }
}
@@ -822,8 +822,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openPathIgnoring
else
xPath = m_aSharedStorages-m_lStoragesUser.openPath(sPath, eMode);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xPath.clear(); }
return xPath;
@@ -921,8 +921,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openLocalizedPat
if (xFolder-isStorageElement(pNames[i]))
lSubFolders.push_back(pNames[i]);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 6d2b6b6..cae935b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1336,7 +1336,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = 0;
}
-catch(const css::uno::Exception ex)
+catch(const css::uno::Exception)
{
// a) FULL DISC seams to be the problem behind
= show error and retry it forever (e.g. retry=300)
// b) unknown problem (may be locking problem)
= reset RETRY value to more usefull value(!) (e.g. retry=3)
@@ -1355,7 +1355,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
else
if (nRetry = GIVE_UP_RETRY)
-throw ex; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
+throw; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
--nRetry;
}
@@ -2374,7 +2374,7 @@ void
[Libreoffice-commits] .: framework/source
framework/source/services/backingwindow.cxx | 20 ++--
framework/source/services/backingwindow.hxx |2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 1f628c7bf8361086be2044d0d6aa8bbf3f128162
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date: Sat Jan 14 00:14:45 2012 +0100
The Open... button's more room problem solved fdo#33794
By adding a int i_nExtraWidth parameter to the layoutButton function
there will be enough space for the open button and its black triangle.
diff --git a/framework/source/services/backingwindow.cxx
b/framework/source/services/backingwindow.cxx
index a28f80f..2db5879 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -572,33 +572,33 @@ void BackingWindow::initControls()
}
// layout the buttons
-layoutButton( WRITER_URL, 0, aFileNewAppsAvailable,
+layoutButton( WRITER_URL, 0, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
maWriterButton, aMnemns );
-layoutButton( DRAW_URL, 1, aFileNewAppsAvailable,
+layoutButton( DRAW_URL, 1, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SDRAW,
maDrawButton, aMnemns );
nYPos += maButtonImageSize.Height() + 10;
-layoutButton( CALC_URL, 0, aFileNewAppsAvailable,
+layoutButton( CALC_URL, 0, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SCALC,
maCalcButton, aMnemns );
-layoutButton( BASE_URL, 1, aFileNewAppsAvailable,
+layoutButton( BASE_URL, 1, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SDATABASE,
maDBButton, aMnemns );
nYPos += maButtonImageSize.Height() + 10;
-layoutButton( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
+layoutButton( IMPRESS_WIZARD_URL, 0, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SIMPRESS,
maImpressButton, aMnemns );
-layoutButton( MATH_URL, 1, aFileNewAppsAvailable,
+layoutButton( MATH_URL, 1, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SMATH,
maMathButton, aMnemns );
nYPos += 3*maButtonImageSize.Height() / 2;
-layoutButton( NULL, 0, aFileNewAppsAvailable,
+layoutButton( NULL, 0, 18, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
maOpenButton, aMnemns, maOpenString );
-layoutButton( NULL, 1, aFileNewAppsAvailable,
+layoutButton( NULL, 1, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
maTemplateButton, aMnemns, maTemplateString );
nYPos += 10;
@@ -664,7 +664,7 @@ void BackingWindow::loadImage( const ResId i_rId,
PushButton i_rButton )
}
void BackingWindow::layoutButton(
- const char* i_pURL, int nColumn,
+ const char* i_pURL, int nColumn, int i_nExtraWidth,
const std::setrtl::OUString i_rURLS,
SvtModuleOptions i_rOpt, SvtModuleOptions::EModule
i_eMod,
PushButton i_rBtn,
@@ -690,7 +690,7 @@ void BackingWindow::layoutButton(
long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
-nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the
safe side
+nTextWidth += maButtonImageSize.Width() + 8 + i_nExtraWidth; // add some
fuzz to be on the safe side
if( nColumn = 0 nColumn
static_castint(SAL_N_ELEMENTS(mnColumnWidth)) )
{
if( nTextWidth mnColumnWidth[nColumn] )
diff --git a/framework/source/services/backingwindow.hxx
b/framework/source/services/backingwindow.hxx
index 410862f..179a632 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -144,7 +144,7 @@ namespace framework
void loadImage( const ResId i_rId, PushButton i_rButton );
-void layoutButton( const char* i_pURL, int nColumn, const
std::setrtl::OUString i_rURLS,
+void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth,
const std::setrtl::OUString i_rURLS,
SvtModuleOptions i_rOpt, SvtModuleOptions::EModule
i_eMod,
PushButton i_rBtn,
MnemonicGenerator i_rMnemonicGen,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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] .: framework/source svx/source
framework/source/uielement/controlmenucontroller.cxx |4 ++--
svx/source/form/fmshimp.cxx | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5f2355014375adb66dd8e986068abc8429e0ad0d
Author: Matúš Kukan matus.ku...@gmail.com
Date: Wed Jan 4 21:58:46 2012 +0100
make these variables static
diff --git a/framework/source/uielement/controlmenucontroller.cxx
b/framework/source/uielement/controlmenucontroller.cxx
index a946858..1f5e64e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -115,7 +115,7 @@
#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12)
#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13)
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -139,7 +139,7 @@ sal_Int16 nConvertSlots[] =
SID_FM_CONVERTTO_SPINBUTTON
};
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
{
SID_FM_EDIT,
SID_FM_PUSHBUTTON,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e261c21..04751bb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -117,7 +117,7 @@
#include vector
// wird fuer Invalidate verwendet - mitpflegen
-sal_uInt16 DatabaseSlotMap[] =
+static sal_uInt16 DatabaseSlotMap[] =
{
SID_FM_RECORD_FIRST,
SID_FM_RECORD_NEXT,
@@ -145,7 +145,7 @@ sal_uInt16 DatabaseSlotMap[] =
// wird fuer Invalidate verwendet - mitpflegen
// aufsteigend sortieren !!
-sal_Int16 DlgSlotMap[] =// slots des Controllers
+static sal_Int16 DlgSlotMap[] =// slots des Controllers
{
SID_FM_CTL_PROPERTIES,
SID_FM_PROPERTIES,
@@ -161,7 +161,7 @@ sal_Int16 DlgSlotMap[] =// slots des Controllers
0
};
-sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
+static sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige Slots
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -192,7 +192,7 @@ sal_Int16 SelObjectSlotMap[] = // vom SelObject abhaengige
Slots
// die folgenden Arrays muessen kosistent sein, also einander entsprechende
Eintraege an der selben relativen Position
// innerhalb ihres jeweiligen Arrays stehen
-sal_Int16 nConvertSlots[] =
+static sal_Int16 nConvertSlots[] =
{
SID_FM_CONVERTTO_EDIT,
SID_FM_CONVERTTO_BUTTON,
@@ -216,7 +216,7 @@ sal_Int16 nConvertSlots[] =
SID_FM_CONVERTTO_NAVIGATIONBAR
};
-sal_Int16 nCreateSlots[] =
+static sal_Int16 nCreateSlots[] =
{
SID_FM_EDIT,
SID_FM_PUSHBUTTON,
@@ -240,7 +240,7 @@ sal_Int16 nCreateSlots[] =
SID_FM_NAVIGATIONBAR
};
-sal_Int16 nObjectTypes[] =
+static sal_Int16 nObjectTypes[] =
{
OBJ_FM_EDIT,
OBJ_FM_BUTTON,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/loadenv/loadenv.cxx | 36 +--
1 file changed, 22 insertions(+), 14 deletions(-)
New commits:
commit 80cc772841dc3b03f0a629215858d0a44f5419a1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 10:00:36 2011 +
pretty up exception message for display in StarBasic dialogs
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index ef65152..090b6aa 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -193,24 +193,32 @@ css::uno::Reference css::lang::XComponent
LoadEnv::loadComponentFromURL(const
switch(ex.m_nID)
{
case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
-throw css::lang::IllegalArgumentException(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list of arguments seem to
be corrupted.)),
-xLoader,
-4);
+throw css::lang::IllegalArgumentException(
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Optional list
of arguments seem to be corrupted.)),
+xLoader,
+4);
case LoadEnvException::ID_UNSUPPORTED_CONTENT:
-throw css::lang::IllegalArgumentException(
-(rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(Unsupported URL )) +
- sURL +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(: \)) +
- rtl::OStringToOUString(
- ex.m_sMessage, RTL_TEXTENCODING_UTF8) +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\))),
+{
+rtl::OUStringBuffer aMsg;
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(Unsupported URL
)).
+append(sURL).append('');
+
+if (!ex.m_sMessage.isEmpty())
+{
+aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM(: \)).
+append(rtl::OStringToOUString(
+ ex.m_sMessage, RTL_TEXTENCODING_UTF8)).
+appendAscii(RTL_CONSTASCII_STRINGPARAM(\));
+}
+
+throw
css::lang::IllegalArgumentException(aMsg.makeStringAndClear(),
xLoader, 1);
+}
-default: xComponent.clear();
-break;
+default:
+xComponent.clear();
+break;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/classes/fwlresid.cxx|2 +-
framework/source/fwe/classes/fwkresid.cxx|2 +-
framework/source/uielement/controlmenucontroller.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit de30370096b82e4ea24c13b7c7e8f525e074fe60
Author: Andras Timar ati...@suse.com
Date: Sun Dec 18 23:16:15 2011 +0100
Always load res of LibO UI locale, not system deflocale fdo#43475
diff --git a/framework/source/classes/fwlresid.cxx
b/framework/source/classes/fwlresid.cxx
index 768432e..b61bfd0 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -44,7 +44,7 @@ ResMgr* FwlResId::GetResManager()
if ( !pResMgr )
{
SolarMutexGuard aSolarGuard;
-pResMgr = ResMgr::CreateResMgr(fwe);
+pResMgr = ResMgr::CreateResMgr(fwe,
Application::GetSettings().GetUILocale());
}
return pResMgr;
diff --git a/framework/source/fwe/classes/fwkresid.cxx
b/framework/source/fwe/classes/fwkresid.cxx
index cf1bcec..0c0a9d4 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -44,7 +44,7 @@ ResMgr* FwkResId::GetResManager()
if ( !pResMgr )
{
SolarMutexGuard aSolarGuard;
-pResMgr = ResMgr::CreateResMgr(fwe);
+pResMgr = ResMgr::CreateResMgr(fwe,
Application::GetSettings().GetUILocale());
}
return pResMgr;
diff --git a/framework/source/uielement/controlmenucontroller.cxx
b/framework/source/uielement/controlmenucontroller.cxx
index 7fd52d3..a946858 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -226,7 +226,7 @@ ControlMenuController::~ControlMenuController()
// private function
void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
{
-ResMgr* pResMgr = ResMgr::CreateResMgr(svx);
+ResMgr* pResMgr = ResMgr::CreateResMgr(svx,
Application::GetSettings().GetUILocale());
ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
aResId.SetRT( RSC_IMAGELIST );
@@ -375,7 +375,7 @@ void ControlMenuController::impl_setPopupMenu()
{
if ( m_pResPopupMenu == 0 )
{
-ResMgr* pResMgr = ResMgr::CreateResMgr(svx);
+ResMgr* pResMgr = ResMgr::CreateResMgr(svx,
Application::GetSettings().GetUILocale());
if ( pResMgr )
{
ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/lomenubar/FrameJob.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 487968707f9ea36f3873a9349ebb87655f6abb3d
Author: August Sodora aug...@gmail.com
Date: Mon Nov 21 19:56:51 2011 -0500
cppcheck: C-style pointer casting
diff --git a/framework/source/lomenubar/FrameJob.cxx
b/framework/source/lomenubar/FrameJob.cxx
index 06af939..fd9d5da 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -153,7 +153,7 @@ on_registrar_available (GDBusConnection * /*connection*/,
GError *error = NULL;
GDBusProxy *proxy;
-FrameHelper *helper = (FrameHelper*)user_data;
+FrameHelper *helper = static_castFrameHelper*(user_data);
unsigned long xid = helper-getXID();
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
@@ -207,7 +207,7 @@ on_registrar_unavailable (GDBusConnection * /*connection*/,
//TODO: Unregister window?
// Show menubar
-FrameHelper *helper = (FrameHelper*)user_data;
+FrameHelper *helper = static_castFrameHelper*(user_data);
Reference XFrame xFrame = helper-getFrame ();
Reference XPropertySet frameProps (xFrame, UNO_QUERY);
Reference XLayoutManager
xLayoutManager(frameProps-getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(LayoutManager))),
@@ -343,8 +343,9 @@ FrameJob::getRootMenuitem (Reference XMenu xMenu,
gpointer helper)
{
DbusmenuMenuitem *root = dbusmenu_menuitem_new_with_id (0);
-((FrameHelper*)helper)-setRootItem(root);
-((FrameHelper*)helper)-rebuildMenu (xMenu, root);
+FrameHelper* fHelper = static_castFrameHelper*(helper);
+fHelper-setRootItem(root);
+fHelper-rebuildMenu (xMenu, root);
return root;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/loadenv/loadenv.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 718f032a3c9dc5071f86a6d69321dc23d6b56188
Author: Michael Stahl mst...@redhat.com
Date: Mon Nov 14 20:35:32 2011 +0100
LoadEnv::impl_makeFrameWindowVisible: fix crash:
do not insert Preview property if it does not exist already
(dbaccess crashes after throwing uncaught exception because of this
when creating new database;
regression in 88285f84bdf54147ee5238e97d0d805fa1c127c1)
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 61c520d..e82823b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1688,14 +1688,14 @@ void LoadEnv::impl_makeFrameWindowVisible(const
css::uno::Reference css::awt::X
Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if ( pWindow )
{
-bool preview(false);
-css::uno::Any a =
m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_PREVIEW()];
-a = preview;
+bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault(
+::comphelper::MediaDescriptor::PROP_PREVIEW(), sal_False) );
bool bForceFrontAndFocus(false);
if ( !preview )
{
-a = ::comphelper::ConfigurationHelper::readDirectKey(
+css::uno::Any const a =
+::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/View)),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NewDocumentHandling)),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/loadenv/loadenv.cxx | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 88285f84bdf54147ee5238e97d0d805fa1c127c1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Nov 13 15:26:41 2011 +0100
fdo#35091 do not honour ForceFocusAndToFront preference for preview
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 409ef40..2e100c1 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode:
nil; c-basic-offset: 4 -*- */
/*
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1688,14 +1688,21 @@ void LoadEnv::impl_makeFrameWindowVisible(const
css::uno::Reference css::awt::X
Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if ( pWindow )
{
+bool preview(false);
+css::uno::Any a =
m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_PREVIEW()];
+a = preview;
+
bool bForceFrontAndFocus(false);
-css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(
-xSMGR,
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/View)),
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NewDocumentHandling)),
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ForceFocusAndToFront)),
-::comphelper::ConfigurationHelper::E_READONLY);
-a = bForceFrontAndFocus;
+if ( !preview )
+{
+a = ::comphelper::ConfigurationHelper::readDirectKey(
+ xSMGR,
+
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/View)),
+
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NewDocumentHandling)),
+
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ForceFocusAndToFront)),
+ ::comphelper::ConfigurationHelper::E_READONLY);
+a = bForceFrontAndFocus;
+}
if( pWindow-IsVisible() (bForceFrontAndFocus || bForceToFront) )
pWindow-ToTop();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source scp2/source
framework/source/services/substitutepathvars.cxx |9 ++---
scp2/source/ooo/directory_ooo.scp|6 +++---
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit d0a0513a9cbd25b2bcd933ec337f6366c86917cb
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 18 18:49:34 2011 +0200
Undo basis/brand split: move program/{addin,filter,plugin} from basis to
brand.
And let $(prog), $(progpath), $(progurl) point to brand program/
instead of basis program/.
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index e7648d2..d7e45ef 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1186,12 +1186,6 @@ void
SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
::utl::Bootstrap::PathStatus aState;
::rtl::OUString sVal ;
-rtl::OUString basis(RTL_CONSTASCII_USTRINGPARAM($OOO_BASE_DIR));
-rtl::Bootstrap::expandMacros(basis);
-if( basis.isEmpty() ) {
-LOG_ERROR( SubstitutePathVariables::SetPredefinedPathVariables,
Bootstrap code has no value for OOO_BASE_DIR!);
-}
-
aState = utl::Bootstrap::locateUserData( sVal );
//There can be the valid case that there is no user installation. For
example, unopkg sync
//is currently (OOo3.4) run as part of the setup. Then no user
installation is required.
@@ -1215,7 +1209,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables(
PredefinedPathVariable
// Detect the program directory
// Set $(prog), $(progpath), $(progurl)
-INetURLObject aProgObj( basis );
+INetURLObject aProgObj(
+aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] );
if ( !aProgObj.HasError() aProgObj.insertName(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(program)) ) )
{
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] =
aProgObj.GetMainURL(INetURLObject::NO_DECODE);
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 726834a..836e79a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -127,7 +127,7 @@ End
Directory gid_Dir_Addin
Styles = (CREATE);
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
DosName = addin;
End
@@ -137,7 +137,7 @@ Directory gid_Dir_Addin_Source
End
Directory gid_Dir_Filter
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
DosName = filter;
End
@@ -344,7 +344,7 @@ Directory gid_Dir_Work
End
Directory gid_Dir_Plugin
-ParentID = gid_Dir_Program;
+ParentID = gid_Brand_Dir_Program;
DosName = plugin;
Styles = (WORKSTATION, CREATE);
End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
