cui/source/dialogs/about.cxx | 39 ++++++++++++++++---
sc/source/ui/src/optsolver.src | 84 ++++++++++++++++++++---------------------
2 files changed, 76 insertions(+), 47 deletions(-)
New commits:
commit 291f3fe9d05eccfd125cdaafcdf01328e754122c
Author: Andras Timar <ati...@suse.com>
Date: Thu Jul 12 15:03:51 2012 +0200
fdo#52000 take website url from configuration
instead of taking it from a localized resource. This way
we have more control over localizations, no need to ping
each l10n team.
Change-Id: I4f8904b4601cd623399146ce060b9697d7b52671
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index daa6628..8ba491c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/uno/Any.h>
#include <vcl/graph.hxx>
#include <svtools/filter.hxx>
+#include <svtools/langhelp.hxx>
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
#include "com/sun/star/system/XSystemShellExecute.hpp"
@@ -56,6 +57,8 @@
#include <vcl/bitmap.hxx>
#include <vcl/rendergraphicrasterizer.hxx>
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
using namespace ::com::sun::star;
enum AboutDialogButton
@@ -121,22 +124,48 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton
)
if ( pDialogButton == (AboutDialogButton*)CREDITS_BUTTON )
sURL = m_aCreditsLinkStr;
else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
- sURL = m_aWebsiteLinkStr;
+ {
+ try
+ {
+ Reference<lang::XMultiServiceFactory> xConfig(
comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(
"com.sun.star.configuration.ConfigurationProvider" )),UNO_QUERY);
+ if( xConfig.is() )
+ {
+ Sequence<Any> args(1);
+ PropertyValue val(
+ rtl::OUString( "nodepath" ),
+ 0,
+ Any(rtl::OUString(
"/org.openoffice.Office.Common/Help/StartCenter" )),
+ PropertyState_DIRECT_VALUE);
+ args.getArray()[0] <<= val;
+ Reference<container::XNameAccess>
xNameAccess(xConfig->createInstanceWithArguments(rtl::OUString(
"com.sun.star.configuration.ConfigurationAccess" ),args), UNO_QUERY);
+ if( xNameAccess.is() )
+ {
+ //throws css::container::NoSuchElementException,
css::lang::WrappedTargetException
+ Any value( xNameAccess->getByName(rtl::OUString( "InfoURL"
)) );
+ sURL = value.get<rtl::OUString> ();
+ localizeWebserviceURI(sURL);
+ }
+ }
+ }
+ catch (const Exception&)
+ {
+ }
+ }
// If the URL is empty, don't do anything
if ( sURL.isEmpty() )
return 1;
try
{
- uno::Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
+ Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute")
), uno::UNO_QUERY_THROW );
+ DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute")
), UNO_QUERY_THROW );
xSystemShellExecute->execute( sURL, rtl::OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
- catch (const uno::Exception&)
+ catch (const Exception&)
{
- uno::Any exc( ::cppu::getCaughtException() );
+ Any exc( ::cppu::getCaughtException() );
rtl::OUString msg( ::comphelper::anyToString( exc ) );
const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
commit 7444b258df32638876257bab588f8d3513602781
Author: Andras Timar <ati...@suse.com>
Date: Thu Jul 12 15:01:26 2012 +0200
fdo#35953 resize controls on Solver dialog of Calc
Change-Id: Ia1130d241f6c01079449e670e26054bbc1a798ea
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index 3cfc275..b6dfcb5 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -24,7 +24,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpId = CMD_SID_OPENDLG_OPTSOLVER ;
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 230 , 210 ) ;
+ Size = MAP_APPFONT ( 250 , 210 ) ;
Text [ en-US ] = "Solver" ;
Moveable = TRUE ;
Closeable = FALSE ;
@@ -39,14 +39,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL";
Border = TRUE ;
- Pos = MAP_APPFONT ( 67 , 6 ) ;
+ Pos = MAP_APPFONT ( 87 , 6 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_OBJECTIVECELL
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL";
- Pos = MAP_APPFONT ( 199 , 5 ) ;
+ Pos = MAP_APPFONT ( 219 , 5 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -55,13 +55,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_DIRECTION
{
Pos = MAP_APPFONT ( 6 , 24 ) ;
- Size = MAP_APPFONT ( 59 , 8 ) ;
+ Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = "Optimize result to" ;
};
RadioButton RB_MAX
{
HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX";
- Pos = MAP_APPFONT ( 67 , 24 ) ;
+ Pos = MAP_APPFONT ( 87 , 24 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Maximum" ;
TabStop = TRUE ;
@@ -69,7 +69,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_MIN
{
HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN";
- Pos = MAP_APPFONT ( 67 , 38 ) ;
+ Pos = MAP_APPFONT ( 87 , 38 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Minimum" ;
TabStop = TRUE ;
@@ -77,7 +77,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
RadioButton RB_VALUE
{
HelpID = "sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE";
- Pos = MAP_APPFONT ( 67 , 52 ) ;
+ Pos = MAP_APPFONT ( 87 , 52 ) ;
Size = MAP_APPFONT ( 59 , 10 ) ;
Text [ en-US ] = "Value of" ;
TabStop = TRUE ;
@@ -86,14 +86,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET";
Border = TRUE ;
- Pos = MAP_APPFONT ( 128 , 50 ) ;
+ Pos = MAP_APPFONT ( 148 , 50 ) ;
Size = MAP_APPFONT ( 69 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_TARGET
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET";
- Pos = MAP_APPFONT ( 199 , 49 ) ;
+ Pos = MAP_APPFONT ( 219 , 49 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -102,21 +102,21 @@ ModelessDialog RID_SCDLG_OPTSOLVER
FixedText FT_VARIABLECELLS
{
Pos = MAP_APPFONT ( 6 , 68 ) ;
- Size = MAP_APPFONT ( 59 , 8 ) ;
+ Size = MAP_APPFONT ( 79 , 8 ) ;
Text [ en-US ] = "By changing cells" ;
};
Edit ED_VARIABLECELLS
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS";
Border = TRUE ;
- Pos = MAP_APPFONT ( 67 , 66 ) ;
+ Pos = MAP_APPFONT ( 87 , 66 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_VARIABLECELLS
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS";
- Pos = MAP_APPFONT ( 199 , 65 ) ;
+ Pos = MAP_APPFONT ( 219 , 65 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -137,13 +137,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
};
FixedText FT_OPERATOR
{
- Pos = MAP_APPFONT ( 84 , 102 ) ;
+ Pos = MAP_APPFONT ( 104 , 102 ) ;
Size = MAP_APPFONT ( 38 , 8 ) ;
Text [ en-US ] = "Operator" ;
};
FixedText FT_CONSTRAINT
{
- Pos = MAP_APPFONT ( 128 , 102 ) ;
+ Pos = MAP_APPFONT ( 148 , 102 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "Value" ;
};
@@ -153,13 +153,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 114 ) ;
- Size = MAP_APPFONT ( 53 , 12 ) ;
+ Size = MAP_APPFONT ( 73 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_LEFT1
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT1";
- Pos = MAP_APPFONT ( 67 , 113 ) ;
+ Pos = MAP_APPFONT ( 87 , 113 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -168,7 +168,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP1";
Border = TRUE ;
- Pos = MAP_APPFONT ( 84 , 114 ) ;
+ Pos = MAP_APPFONT ( 104 , 114 ) ;
Size = MAP_APPFONT ( 38 , 56 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -185,14 +185,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT1";
Border = TRUE ;
- Pos = MAP_APPFONT ( 128 , 114 ) ;
+ Pos = MAP_APPFONT ( 148 , 114 ) ;
Size = MAP_APPFONT ( 53 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_RIGHT1
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT1";
- Pos = MAP_APPFONT ( 183 , 113 ) ;
+ Pos = MAP_APPFONT ( 203 , 113 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -200,7 +200,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
ImageButton IB_DELETE1
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE1";
- Pos = MAP_APPFONT ( 199 , 113 ) ;
+ Pos = MAP_APPFONT ( 219 , 113 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Remove" ;
@@ -212,13 +212,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT2";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 129 ) ;
- Size = MAP_APPFONT ( 53 , 12 ) ;
+ Size = MAP_APPFONT ( 73 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_LEFT2
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT2";
- Pos = MAP_APPFONT ( 67 , 128 ) ;
+ Pos = MAP_APPFONT ( 87 , 128 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -227,7 +227,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP2";
Border = TRUE ;
- Pos = MAP_APPFONT ( 84 , 129 ) ;
+ Pos = MAP_APPFONT ( 104 , 129 ) ;
Size = MAP_APPFONT ( 38 , 56 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -244,14 +244,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT2";
Border = TRUE ;
- Pos = MAP_APPFONT ( 128 , 129 ) ;
+ Pos = MAP_APPFONT ( 148 , 129 ) ;
Size = MAP_APPFONT ( 53 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_RIGHT2
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT2";
- Pos = MAP_APPFONT ( 183 , 128 ) ;
+ Pos = MAP_APPFONT ( 203 , 128 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -259,7 +259,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
ImageButton IB_DELETE2
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE2";
- Pos = MAP_APPFONT ( 199 , 128 ) ;
+ Pos = MAP_APPFONT ( 219 , 128 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Remove" ;
@@ -271,13 +271,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT3";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 144 ) ;
- Size = MAP_APPFONT ( 53 , 12 ) ;
+ Size = MAP_APPFONT ( 73 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_LEFT3
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT3";
- Pos = MAP_APPFONT ( 67 , 143 ) ;
+ Pos = MAP_APPFONT ( 87 , 143 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -286,7 +286,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP3";
Border = TRUE ;
- Pos = MAP_APPFONT ( 84 , 144 ) ;
+ Pos = MAP_APPFONT ( 104 , 144 ) ;
Size = MAP_APPFONT ( 38 , 56 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -303,14 +303,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT3";
Border = TRUE ;
- Pos = MAP_APPFONT ( 128 , 144 ) ;
+ Pos = MAP_APPFONT ( 148 , 144 ) ;
Size = MAP_APPFONT ( 53 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_RIGHT3
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT3";
- Pos = MAP_APPFONT ( 183 , 143 ) ;
+ Pos = MAP_APPFONT ( 203 , 143 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -318,7 +318,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
ImageButton IB_DELETE3
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE3";
- Pos = MAP_APPFONT ( 199 , 143 ) ;
+ Pos = MAP_APPFONT ( 219 , 143 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Remove" ;
@@ -330,13 +330,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT4";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 159 ) ;
- Size = MAP_APPFONT ( 53 , 12 ) ;
+ Size = MAP_APPFONT ( 73 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_LEFT4
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT4";
- Pos = MAP_APPFONT ( 67 , 158 ) ;
+ Pos = MAP_APPFONT ( 87 , 158 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -345,7 +345,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP4";
Border = TRUE ;
- Pos = MAP_APPFONT ( 84 , 159 ) ;
+ Pos = MAP_APPFONT ( 104 , 159 ) ;
Size = MAP_APPFONT ( 38 , 56 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -362,14 +362,14 @@ ModelessDialog RID_SCDLG_OPTSOLVER
{
HelpID = "sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT4";
Border = TRUE ;
- Pos = MAP_APPFONT ( 128 , 159 ) ;
+ Pos = MAP_APPFONT ( 148 , 159 ) ;
Size = MAP_APPFONT ( 53 , 12 ) ;
TabStop = TRUE ;
};
ImageButton IB_RIGHT4
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT4";
- Pos = MAP_APPFONT ( 183 , 158 ) ;
+ Pos = MAP_APPFONT ( 203 , 158 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
QuickHelpText [ en-US ] = "Shrink" ;
@@ -377,7 +377,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
ImageButton IB_DELETE4
{
HelpID = "sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE4";
- Pos = MAP_APPFONT ( 199 , 158 ) ;
+ Pos = MAP_APPFONT ( 219 , 158 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Remove" ;
@@ -386,7 +386,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
ScrollBar SB_SCROLL
{
- Pos = MAP_APPFONT ( 216, 113 ) ;
+ Pos = MAP_APPFONT ( 236, 113 ) ;
Size = MAP_APPFONT ( 8 , 59 ) ;
VScroll = TRUE ;
};
@@ -407,13 +407,13 @@ ModelessDialog RID_SCDLG_OPTSOLVER
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT ( 62 , 190 ) ;
+ Pos = MAP_APPFONT ( 69 , 190 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
CancelButton BTN_CLOSE
{
- Pos = MAP_APPFONT ( 118 , 190 ) ;
+ Pos = MAP_APPFONT ( 132 , 190 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Close" ;
@@ -421,7 +421,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER
PushButton BTN_SOLVE
{
HelpID = "sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE";
- Pos = MAP_APPFONT ( 174 , 190 ) ;
+ Pos = MAP_APPFONT ( 195 , 190 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Solve" ;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
