You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/27 15:45:34 UTC
svn commit: r1354497 [4/33] - in /incubator/ooo/branches/alg/aw080: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/
ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/
ext_sources/ main/ main/animations/source/animco...
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.cxx Wed Jun 27 13:44:09 2012
@@ -45,349 +45,292 @@
#include <dialmgr.hxx>
#include <svtools/svtools.hrc>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+
// defines ---------------------------------------------------------------
-#define SCROLL_OFFSET 1
-#define SPACE_OFFSET 5
-#define SCROLL_TIMER 30
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
-#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" )
+// -----------------------------------------------------------------------
-// class AboutDialog -----------------------------------------------------
-static void layoutText( FixedInfo &rText, long &nY, long nTextWidth, Size a6Size )
+static void layoutFixedText( FixedText &rControl, const Point& aPos, Size &aSize, const long nTextWidth )
{
- Point aTextPos = rText.GetPosPixel();
- aTextPos.X() = a6Size.Width() * 2;
- aTextPos.Y() = nY;
- rText.SetPosPixel( aTextPos );
-
- Size aTxtSiz = rText.GetSizePixel();
- aTxtSiz.Width() = nTextWidth;
- Size aCalcSize = rText.CalcMinimumSize( nTextWidth );
- aTxtSiz.Height() = aCalcSize.Height();
- rText.SetSizePixel( aTxtSiz );
+ aSize = rControl.GetSizePixel();
+ // change the width
+ aSize.Width() = nTextWidth;
+ // set Position and Size, to calculate the minimum size
+ // this will update the Height
+ rControl.SetPosSizePixel( aPos, aSize );
+ aSize = rControl.CalcMinimumSize();
+ // update the size with the right Height
+ rControl.SetSizePixel( aSize );
+}
- nY += aTxtSiz.Height();
+static void layoutEdit( Edit &rControl, const Point& aPos, Size &aSize, const long nTextWidth )
+{
+ aSize = rControl.GetSizePixel();
+ // change the width
+ aSize.Width() = nTextWidth;
+ // set Position and Size, to calculate the minimum size
+ // this will update the Height
+ rControl.SetPosSizePixel( aPos, aSize );
+ aSize = rControl.CalcMinimumSize();
+ // update the size with the right Height
+ rControl.SetSizePixel( aSize );
}
-String InitDevVersionStr()
+// -----------------------------------------------------------------------
+
+AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) :
+ SfxModalDialog( pParent, rId ),
+ maOKButton( this, ResId( RID_CUI_ABOUT_BTN_OK, *rId.GetResMgr() ) ),
+ maVersionText( this, ResId( RID_CUI_ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ),
+ maBuildInfoEdit( this, ResId( RID_CUI_ABOUT_FTXT_BUILDDATA, *rId.GetResMgr() ) ),
+ maCopyrightEdit( this, ResId( RID_CUI_ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ),
+ maCreditsLink( this, ResId( RID_CUI_ABOUT_FTXT_WELCOME_LINK, *rId.GetResMgr() ) ),
+ maCopyrightTextStr( ResId( RID_CUI_ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) )
{
- String sDefault;
- String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
- OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" );
+ // load image from module path
+ maAppLogo = SfxApplication::GetApplicationLogo();
- String sProductSource( utl::Bootstrap::getProductSource( sDefault ) );
- OSL_ENSURE( sProductSource.Len() > 0, "No ProductSource in bootstrap file" );
+ InitControls();
- // the product source is something like "DEV300", where the
- // build id is something like "300m12(Build:12345)". For better readability,
- // strip the duplicate UPD ("300").
- if ( sProductSource.Len() )
- {
- bool bMatchingUPD =
- ( sProductSource.Len() >= 3 )
- && ( sBuildId.Len() >= 3 )
- && ( sProductSource.Copy( sProductSource.Len() - 3 ) == sBuildId.Copy( 0, 3 ) );
- OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
- if ( bMatchingUPD )
- sProductSource = sProductSource.Copy( 0, sProductSource.Len() - 3 );
+ // set links
+ maCreditsLink.SetClickHdl( LINK( this, AboutDialog, OpenLinkHdl_Impl ) );
- // prepend the product source
- sBuildId.Insert( sProductSource, 0 );
- }
-
- return sBuildId;
+ FreeResource();
+
+ SetHelpId( CMD_SID_ABOUT );
}
-AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) :
+// -----------------------------------------------------------------------
- SfxModalDialog ( pParent, rId ),
+AboutDialog::~AboutDialog()
+{
+}
- aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ),
- aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ),
- aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ),
- aBuildData ( this ),
- pDeveloperAry(0),
- aAccelStr ( ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ),
- aTimer (),
- nOff ( 0 ),
- m_nDeltaWidth ( 0 ),
- m_nPendingScrolls( 0 ),
- bNormal ( sal_True )
-{
- aDevVersionStr = InitDevVersionStr();
-
- ::com::sun::star::lang::Locale aLocale;
- ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "about", aLocale );
- if ( pResMgr )
- {
- aCopyrightTextStr = String( ResId( ABOUT_STR_COPYRIGHT, *pResMgr ) );
- pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) );
- delete pResMgr;
- }
+// -----------------------------------------------------------------------
- rtl::OUString sProduct;
- utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct;
+void AboutDialog::InitControls()
+{
+ // apply font, background et al.
+ ApplyStyleSettings();
- // load image from module path
- aAppLogo = SfxApplication::GetApplicationLogo();
+ // set strings
+ maCopyrightEdit.SetText( maCopyrightTextStr );
+ maBuildInfoEdit.SetText( GetBuildVersionString() );
+ maCreditsLink.SetURL( maCreditsLink.GetText() );
- // Transparenter Font
- Font aFont = GetFont();
+ // determine size and position of the dialog & elements
+ Size aDlgSize;
+ LayoutControls( aDlgSize );
+
+ // Change the width of the dialog
+ SetOutputSizePixel( aDlgSize );
+}
+
+// -----------------------------------------------------------------------
+
+void AboutDialog::ApplyStyleSettings()
+{
+ // Transparenter Font
+ Font aFont = GetFont();
aFont.SetTransparent( sal_True );
- SetFont( aFont );
+ SetFont( aFont );
- // if necessary more info
- String sVersion = aVersionText.GetText();
- sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() );
- aVersionText.SetText( sVersion );
-
- // Initialisierung fuer Aufruf Entwickler
- if ( aAccelStr.Len() && ByteString(U2S(aAccelStr)).IsAlphaAscii() )
- {
- Accelerator *pAccel = 0, *pPrevAccel = 0, *pFirstAccel = 0;
- aAccelStr.ToUpperAscii();
-
- for ( sal_uInt16 i = 0; i < aAccelStr.Len(); ++i )
- {
- pPrevAccel = pAccel;
- pAccel = new Accelerator;
- aAccelList.Insert( pAccel, LIST_APPEND );
- sal_uInt16 nKey = aAccelStr.GetChar(i) - 'A' + KEY_A;
- pAccel->InsertItem( 1, KeyCode( nKey, KEY_MOD1 ) );
- if ( i > 0 )
- pPrevAccel->SetAccel( 1, pAccel );
- if ( i == 0 )
- pFirstAccel = pAccel;
- }
- pAccel->SetSelectHdl( LINK( this, AboutDialog, AccelSelectHdl ) );
- GetpApp()->InsertAccel( pFirstAccel );
- }
-
- // set for background and text the correct system color
- const StyleSettings& rSettings = GetSettings().GetStyleSettings();
- Color aWhiteCol( rSettings.GetWindowColor() );
- Wallpaper aWall( aWhiteCol );
- SetBackground( aWall );
- Font aNewFont( aCopyrightText.GetFont() );
- aNewFont.SetTransparent( sal_True );
-
- aVersionText.SetFont( aNewFont );
- aCopyrightText.SetFont( aNewFont );
-
- aVersionText.SetBackground();
- aCopyrightText.SetBackground();
-
- Color aTextColor( rSettings.GetWindowTextColor() );
- aVersionText.SetControlForeground( aTextColor );
- aCopyrightText.SetControlForeground( aTextColor );
- aBuildData.SetBackground( );
-
- Font aSmallFont = rSettings.GetInfoFont();
- Size aSmaller = aNewFont.GetSize();
- aSmaller.Width() = (long) (aSmaller.Width() * 0.75);
- aSmaller.Height() = (long) (aSmaller.Height() * 0.75);
- aNewFont.SetSize( aSmaller );
- aBuildData.SetFont( aNewFont );
-
- String sRevision( utl::Bootstrap::getRevisionInfo() );
-
- String aBuildString(aDevVersionStr);
- aBuildString += (DEFINE_CONST_UNICODE(" - Rev. "));
- aBuildString += sRevision;
+ // set for background and text the correct system color
+ const StyleSettings& rSettings = GetSettings().GetStyleSettings();
+ Color aWhiteCol( rSettings.GetWindowColor() );
+ Wallpaper aWall( aWhiteCol );
+ SetBackground( aWall );
+ Font aNewFont( maCopyrightEdit.GetFont() );
+ aNewFont.SetTransparent( sal_True );
+
+ maVersionText.SetFont( aNewFont );
+ maCopyrightEdit.SetFont( aNewFont );
+
+ maVersionText.SetBackground();
+ maCopyrightEdit.SetBackground();
+ maBuildInfoEdit.SetBackground();
+ maCreditsLink.SetBackground();
+
+ Color aTextColor( rSettings.GetWindowTextColor() );
+ maVersionText.SetControlForeground( aTextColor );
+ maCopyrightEdit.SetControlForeground( aTextColor );
+ maBuildInfoEdit.SetControlForeground( aTextColor );
+ maCreditsLink.SetControlForeground();
+
+ Size aSmaller = aNewFont.GetSize();
+ aSmaller.Width() = (long) (aSmaller.Width() * 0.75);
+ aSmaller.Height() = (long) (aSmaller.Height() * 0.75);
+ aNewFont.SetSize( aSmaller );
+
+ maBuildInfoEdit.SetFont( aNewFont );
+
+ // the following is a hack to force the MultiLineEdit update its settings
+ // in order to reflect the Font
+ // See
+ // Window::SetControlFont
+ // MultiLineEdit::StateChanged
+ // MultiLineEdit::ImplInitSettings
+ // TODO Override SetFont in MultiLineEdit and do the following,
+ // otherwise SetFont has no effect at all!
+ aSmaller = PixelToLogic( aSmaller, MAP_POINT );
+ aNewFont.SetSize( aSmaller );
+ maBuildInfoEdit.SetControlFont( aNewFont );
+}
-#ifdef BUILD_VER_STRING
-#define _STRINGIFY(x) #x
-#define STRINGIFY(x) _STRINGIFY(x)
- aBuildString += '\n';
- aBuildString += ( DEFINE_CONST_UNICODE( STRINGIFY( BUILD_VER_STRING ) ) );
-#endif
- aBuildData.SetText( aBuildString );
- aBuildData.Show();
+// -----------------------------------------------------------------------
- // determine size and position of the dialog & elements
- Size aAppLogoSiz = aAppLogo.GetSizePixel();
- Size aOutSiz = GetOutputSizePixel();
- aOutSiz.Width() = aAppLogoSiz.Width();
+void AboutDialog::LayoutControls( Size& aDlgSize )
+{
+ Size aAppLogoSiz = maAppLogo.GetSizePixel();
+
+ aDlgSize = GetOutputSizePixel();
+ aDlgSize.Width() = aAppLogoSiz.Width();
- Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+ Size a6Size = maVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
- long nDlgMargin = a6Size.Width() * 4 ;
+ long nDlgMargin = a6Size.Width() * 2;
long nCtrlMargin = a6Size.Height() * 2;
- long nTextWidth = aOutSiz.Width() - nDlgMargin;
-
- aCopyrightText.SetText( aCopyrightTextStr );
+ long nTextWidth = aDlgSize.Width() - ( nDlgMargin * 2 );
- // layout fixed text controls
- layoutText( aVersionText, nY, nTextWidth, a6Size );
- if( aBuildString.Len() > 0 )
- {
- nY += ( a6Size.Height() / 2 );
- layoutText( aBuildData, nY, nTextWidth, a6Size );
- }
- nY += nCtrlMargin;
+ Point aPos( nDlgMargin, nY );
+ Size aSize;
+ // layout fixed text control
+ layoutFixedText( maVersionText, aPos, aSize, nTextWidth );
+ // set the next control closer
+ nY += aSize.Height() + (nCtrlMargin / 2);
+
+ // Multiline edit with Build info
+ aPos.Y() = nY;
+ layoutEdit( maBuildInfoEdit, aPos, aSize, nTextWidth );
+ nY += aSize.Height() + nCtrlMargin;
- // OK-Button-Position (at the bottom and centered)
- Size aOKSiz = aOKButton.GetSizePixel();
- Point aOKPnt = aOKButton.GetPosPixel();
-
// Multiline edit with Copyright-Text
- Point aCopyPnt = aCopyrightText.GetPosPixel();
- Size aCopySize = aCopyrightText.GetSizePixel();
- aCopySize.Width() = nTextWidth;
- aCopySize.Height() = aOutSiz.Height() - nY - ( aOKSiz.Height() * 2 ) - nCtrlMargin;
-
- aCopyPnt.X() = ( aOutSiz.Width() - aCopySize.Width() ) / 2;
- aCopyPnt.Y() = nY;
- aCopyrightText.SetPosSizePixel( aCopyPnt, aCopySize );
-
- nY += aCopySize.Height() + nCtrlMargin;
- aOKPnt.X() = ( aOutSiz.Width() - aOKSiz.Width() ) / 2;
- aOKPnt.Y() = nY;
- aOKButton.SetPosPixel( aOKPnt );
+ aPos.Y() = nY;
+ layoutEdit( maCopyrightEdit, aPos, aSize, nTextWidth );
+ // set the next control closer
+ nY += aSize.Height() + (nCtrlMargin/2);
+
+ // Hyperlink
+ aPos.Y() = nY;
+ layoutFixedText( maCreditsLink, aPos, aSize, nTextWidth );
+ nY += aSize.Height() + nCtrlMargin;
+
+ // OK-Button-Position (at the bottom and centered)
+ Size aOKSiz = maOKButton.GetSizePixel();
+ Point aOKPnt( ( aDlgSize.Width() - aOKSiz.Width() ) / 2, nY );
+ maOKButton.SetPosPixel( aOKPnt );
- // Change the width of the dialog
- SetOutputSizePixel( aOutSiz );
-
- FreeResource();
-
- SetHelpId( CMD_SID_ABOUT );
+ aDlgSize.Height() = aOKPnt.Y() + aOKSiz.Height() + nCtrlMargin;
}
// -----------------------------------------------------------------------
-AboutDialog::~AboutDialog()
+const rtl::OUString AboutDialog::GetBuildId() const
{
- // L"oschen des Entwickleraufrufs
- delete pDeveloperAry;
- if ( aAccelList.Count() )
- {
- GetpApp()->RemoveAccel( aAccelList.First() );
- Accelerator* pAccel = aAccelList.Last();
+ rtl::OUString sDefault;
- while ( pAccel )
- {
- delete pAccel;
- pAccel = aAccelList.Prev();
- }
- }
-}
+ // Get buildid from version[rc|.ini]
+ rtl::OUString sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
+ OSL_ENSURE( sBuildId.getLength() > 0, "No BUILDID in bootstrap file" );
+ rtl::OUStringBuffer sBuildIdBuff( sBuildId );
+
+ // Get ProductSource from version[rc|.ini]
+ rtl::OUString sProductSource( utl::Bootstrap::getProductSource( sDefault ) );
+ OSL_ENSURE( sProductSource.getLength() > 0, "No ProductSource in bootstrap file" );
+
+ // the product source is something like "AOO340",
+ // while the build id is something like "340m1(Build:9590)"
+ // For better readability, strip the duplicate ProductMajor ("340").
+ if ( sProductSource.getLength() )
+ {
+ bool bMatchingUPD =
+ ( sProductSource.getLength() >= 3 )
+ && ( sBuildId.getLength() >= 3 )
+ && ( sProductSource.copy( sProductSource.getLength() - 3 ) == sBuildId.copy( 0, 3 ) );
+ OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
+ if ( bMatchingUPD )
+ sProductSource = sProductSource.copy( 0, sProductSource.getLength() - 3 );
-// -----------------------------------------------------------------------
+ // prepend the product source
+ sBuildIdBuff.insert( 0, sProductSource );
+ }
-IMPL_LINK( AboutDialog, TimerHdl, Timer *, pTimer )
-{
- (void)pTimer; //unused
- ++m_nPendingScrolls;
- Invalidate( INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN );
- return 0;
+ return sBuildIdBuff.makeStringAndClear();
}
// -----------------------------------------------------------------------
-IMPL_LINK( AboutDialog, AccelSelectHdl, Accelerator *, pAccelerator )
+const rtl::OUString AboutDialog::GetBuildVersionString() const
{
-#ifdef YURI_DARIO
- aCopyrightText.SetHelpText( DEFINE_CONST_UNICODE("Conoscere qualcuno ovunque egli sia, con cui comprendersi nonostante le distanze\n"
- "e le differenze, puo' trasformare la terra in un giardino. baci Valeria") );
+ rtl::OUStringBuffer aBuildString( GetBuildId() );
+ rtl::OUString sRevision( utl::Bootstrap::getRevisionInfo() );
+
+ if ( sRevision.getLength() > 0 )
+ {
+ aBuildString.appendAscii( RTL_CONSTASCII_STRINGPARAM( " - Rev. " ) );
+ aBuildString.append( sRevision );
+ }
+
+#ifdef BUILD_VER_STRING
+ rtl::OUString sBuildVer( RTL_CONSTASCII_USTRINGPARAM( STRINGIFY( BUILD_VER_STRING ) ) );
+ if ( sBuildVer.getLength() > 0 )
+ {
+ aBuildString.append( sal_Unicode( '\n' ) );
+ aBuildString.append( sBuildVer );
+ }
#endif
- (void)pAccelerator; //unused
- // init Timer
- aTimer.SetTimeoutHdl( LINK( this, AboutDialog, TimerHdl ) );
-
- // init scroll mode
- nOff = GetOutputSizePixel().Height();
- MapMode aMapMode( MAP_PIXEL );
- SetMapMode( aMapMode );
- bNormal = sal_False;
-
- // start scroll Timer
- aTimer.SetTimeout( SCROLL_TIMER );
- aTimer.Start();
- return 0;
+ return aBuildString.makeStringAndClear();
}
// -----------------------------------------------------------------------
sal_Bool AboutDialog::Close()
{
- // stop Timer and finish the dialog
- aTimer.Stop();
- EndDialog( RET_OK );
- return( sal_False );
+ EndDialog( RET_OK );
+ return( sal_False );
}
// -----------------------------------------------------------------------
void AboutDialog::Paint( const Rectangle& rRect )
{
- SetClipRegion( rRect );
+ SetClipRegion( rRect );
+ Point aPos( 0, 0 );
+ DrawImage( aPos, maAppLogo );
- if ( bNormal ) // not in scroll mode
- {
- Point aPos( m_nDeltaWidth / 2, 0 );
- DrawImage( aPos, aAppLogo );
- return;
- }
-
- // scroll the content
- const int nDeltaY = -SCROLL_OFFSET * m_nPendingScrolls;
- if( !nDeltaY )
- return;
- nOff += nDeltaY;
- Scroll( 0, nDeltaY, SCROLL_NOERASE );
- m_nPendingScrolls = 0;
-
- // draw the credits text
- const Font aOrigFont = GetFont();
- const int nFullWidth = GetOutputSizePixel().Width();
-
- int nY = nOff;
- const int nDevCnt = static_cast<int>( pDeveloperAry->Count() );
- for( int i = 0; i < nDevCnt; ++i )
- {
- if( nY >= rRect.Bottom() )
- break;
-
- int nPos2 = nY + GetTextHeight() + 3;
- if( nPos2 >= rRect.Top() + nDeltaY )
- {
- const String aStr = pDeveloperAry->GetString(i);
- const long nVal = pDeveloperAry->GetValue(i);
-
- if ( nVal )
- {
- // emphasize the headers
- Font aFont = aOrigFont;
- aFont.SetWeight( (FontWeight)nVal );
- SetFont( aFont );
- nPos2 = nY + GetTextHeight() + 3;
- }
-
- // clear text background
- Rectangle aEraseRect( Point(0,nY), Size( nFullWidth, nPos2-nY));
- Erase( aEraseRect );
-
- // draw centered text
- const long nTextWidth = GetTextWidth( aStr );
- long nX = (nFullWidth - 5 - nTextWidth) / 2;
- if( nX < 0 )
- nX = SPACE_OFFSET;
- const Point aPnt( nX, nY );
- DrawText( aPnt, aStr );
-
- // restore the font if needed
- if( nVal )
- SetFont( aOrigFont );
- }
- nY = nPos2;
- }
-
- // close dialog if the whole text has been scrolled
- if ( nY <= 0 )
- {
- bNormal = sal_True;
- Close();
- }
+ return;
+}
+
+// -----------------------------------------------------------------------
+
+IMPL_LINK ( AboutDialog, OpenLinkHdl_Impl, svt::FixedHyperlink*, EMPTYARG )
+{
+ ::rtl::OUString sURL( maCreditsLink.GetURL() );
+ if ( sURL.getLength() > 0 )
+ {
+ try
+ {
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR =
+ ::comphelper::getProcessServiceFactory();
+ com::sun::star::uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell(
+ xSMGR->createInstance( ::rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
+ com::sun::star::uno::UNO_QUERY_THROW );
+ if ( xSystemShell.is() )
+ xSystemShell->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
+ }
+ catch( const com::sun::star::uno::Exception& e )
+ {
+ OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
+ rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+ }
+ }
+ return 0;
}
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.hrc Wed Jun 27 13:44:09 2012
@@ -21,10 +21,11 @@
-#include <sfx2/sfx.hrc>
-
-#define ABOUT_BTN_OK 1
-#define ABOUT_FTXT_VERSION 1
-#define ABOUT_STR_ACCEL 3
-#define ABOUT_FTXT_COPYRIGHT 4
+#include <cuires.hrc>
+#define RID_CUI_ABOUT_BTN_OK 1
+#define RID_CUI_ABOUT_FTXT_VERSION 2
+#define RID_CUI_ABOUT_FTXT_COPYRIGHT 3
+#define RID_CUI_ABOUT_FTXT_BUILDDATA 4
+#define RID_CUI_ABOUT_STR_COPYRIGHT 5
+#define RID_CUI_ABOUT_FTXT_WELCOME_LINK 6
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.src (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/dialogs/about.src Wed Jun 27 13:44:09 2012
@@ -27,37 +27,43 @@ ModalDialog RID_DEFAULTABOUT
{
HelpID = "cui:ModalDialog:RID_DEFAULTABOUT";
OutputSize = TRUE ;
- Size = MAP_APPFONT ( 245 , 260 ) ;
Moveable = TRUE ;
SVLook = TRUE ;
- Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME";
Text [ en-US ] = "About %PRODUCTNAME" ;
- OKButton ABOUT_BTN_OK
+ OKButton RID_CUI_ABOUT_BTN_OK
{
DefButton = TRUE ;
- Pos = MAP_APPFONT ( 174 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
- FixedText ABOUT_FTXT_VERSION
+ FixedText RID_CUI_ABOUT_FTXT_VERSION
{
- Pos = MAP_APPFONT ( 54 , 6 ) ;
- Size = MAP_APPFONT ( 118 , 16 ) ;
WordBreak = TRUE ;
Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
};
- MultiLineEdit ABOUT_FTXT_COPYRIGHT
+ MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
+ {
+ //HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA";
+ Border = FALSE ;
+ IgnoreTab = TRUE ;
+ ReadOnly = TRUE ;
+ AutoVScroll = FALSE ;
+ };
+ MultiLineEdit RID_CUI_ABOUT_FTXT_COPYRIGHT
{
HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
Border = FALSE ;
- Pos = MAP_APPFONT ( 54 , 25 ) ;
- Size = MAP_APPFONT ( 168 , 51 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
- AutoVScroll = TRUE ;
+ AutoVScroll = FALSE ;
+ };
+ FixedText RID_CUI_ABOUT_FTXT_WELCOME_LINK
+ {
+ Left = TRUE ;
+ Text = "http://www.openoffice.org/welcome/credits.html";
};
- String ABOUT_STR_ACCEL
+ String RID_CUI_ABOUT_STR_COPYRIGHT
{
- Text = "SDT" ;
+ Text[ en-US ] = "Copyright © 2012 Apache Software Foundation.\nAll rights reserved.\n\nThis product was created by %OOOVENDOR, based on Apache OpenOffice.\nApache OpenOffice acknowledges all community members, especially those mentioned at";
};
};
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/inc/SpellDialog.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/inc/SpellDialog.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/inc/SpellDialog.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/inc/SpellDialog.hxx Wed Jun 27 13:44:09 2012
@@ -212,6 +212,7 @@ private:
DECL_LINK( CancelHdl, Button * );
DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
DECL_LINK( UndoHdl, Button * );
+ DECL_LINK( MenuButtonActivateHdl, MenuButton* );
DECL_LINK( AddToDictionaryHdl, MenuButton* );
DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/inc/about.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/inc/about.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/inc/about.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/inc/about.hxx Wed Jun 27 13:44:09 2012
@@ -25,53 +25,46 @@
// include ---------------------------------------------------------------
-#include <tools/resary.hxx>
#include <vcl/button.hxx>
-#include <vcl/accel.hxx>
#include <svtools/svmedit.hxx>
+#include <svtools/fixedhyper.hxx>
#include <tools/list.hxx>
#include <svtools/stdctrl.hxx>
-#include <sfx2/basedlgs.hxx> // SfxModalDialog
-
-DECLARE_LIST( AccelList, Accelerator* )
+#include <sfx2/basedlgs.hxx> // SfxModalDialog
// class AboutDialog -----------------------------------------------------
class AboutDialog : public SfxModalDialog
{
private:
- OKButton aOKButton;
- Image aAppLogo;
+ OKButton maOKButton;
+ FixedInfo maVersionText;
+ MultiLineEdit maBuildInfoEdit;
+ MultiLineEdit maCopyrightEdit;
+ svt::FixedHyperlink maCreditsLink;
+
+ Image maAppLogo;
+
+ String maCopyrightTextStr;
+ rtl::OUString maVersionData;
+
+ void InitControls();
+ void ApplyStyleSettings();
+ void LayoutControls( Size& aDlgSize );
- FixedInfo aVersionText;
- MultiLineEdit aCopyrightText;
- FixedInfo aBuildData;
-
- ResStringArray* pDeveloperAry;
- String aDevVersionStr;
- String aAccelStr;
- String aVersionData;
- String aCopyrightTextStr;
-
- AccelList aAccelList;
-
- AutoTimer aTimer;
- long nOff;
- long m_nDeltaWidth;
- int m_nPendingScrolls;
+ const rtl::OUString GetBuildId() const;
+ const rtl::OUString GetBuildVersionString() const;
- sal_Bool bNormal;
+ DECL_DLLPRIVATE_LINK(OpenLinkHdl_Impl, svt::FixedHyperlink* );
protected:
- virtual sal_Bool Close();
- virtual void Paint( const Rectangle& );
+ virtual sal_Bool Close();
+ virtual void Paint( const Rectangle& );
public:
- AboutDialog( Window* pParent, const ResId& nId );
- ~AboutDialog();
+ AboutDialog( Window* pParent, const ResId& nId );
+ ~AboutDialog();
- DECL_LINK( TimerHdl, Timer * );
- DECL_LINK( AccelSelectHdl, Accelerator * );
};
#endif // #ifndef _ABOUT_HXX
Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx Wed Jun 27 13:44:09 2012
@@ -26,17 +26,12 @@
// include ---------------------------------------------------------------
-#ifndef _SVX_SIZEITEM_HXX //autogen
-
#include <editeng/sizeitem.hxx>
-#endif
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-
#define _SVX_TPLINE_CXX
-
#include <cuires.hrc>
#include "tabline.hrc"
#include "svx/xattr.hxx"
@@ -49,7 +44,6 @@
#include "svx/dlgutil.hxx"
#include <svx/svdmodel.hxx>
#include "svx/svxgrahicitem.hxx"
-//#include "linectrl.hrc"
#include <sfx2/request.hxx>
#include "svx/ofaitem.hxx"
#include <svx/svdobj.hxx>
@@ -1030,9 +1024,8 @@ void SvxLineTabPage::Reset( const SfxIte
if(pObj)
{
pObj = pObj->CloneSdrObject();
- pPage->InsertObjectToSdrObjList(*pObj);
- pView->MarkObj(*pObj);
- if(pSymbolAttr)
+
+ if(pSymbolAttr)
{
pObj->SetMergedItemSet(*pSymbolAttr);
}
@@ -1040,19 +1033,35 @@ void SvxLineTabPage::Reset( const SfxIte
{
pObj->SetMergedItemSet(rOutAttrs);
}
+
+ pPage->InsertObjectToSdrObjList(*pObj);
+
+ // Generate invisible square to give all symbol types a
+ // bitmap size, which is indepedent from specific glyph
+ SdrObject *pInvisibleSquare = pSymbolList->GetObj(0);
+ pInvisibleSquare = pInvisibleSquare->CloneSdrObject();
+ pPage->InsertObjectToSdrObjList(*pInvisibleSquare);
+ pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100));
+ pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100));
+
+ pView->MarkAll();
GDIMetaFile aMeta(pView->GetMarkedObjMetaFile());
aSymbolGraphic=Graphic(aMeta);
aSymbolSize=sdr::legacy::GetSnapRect(*pObj).GetSize();
- aSymbolGraphic.SetPrefSize(aSymbolSize);
+ aSymbolGraphic.SetPrefSize(sdr::legacy::GetSnapRect(*pInvisibleSquare).GetSize());
aSymbolGraphic.SetPrefMapMode(MAP_100TH_MM);
bPrevSym=sal_True;
bEnable=sal_True;
bIgnoreGraphic=sal_True;
pView->UnmarkAll();
- pObj=pPage->RemoveObjectFromSdrObjList(0);
- deleteSdrObjectSafeAndClearPointer( pObj );
+
+ pInvisibleSquare = pPage->RemoveObjectFromSdrObjList(pInvisibleSquare->GetNavigationPosition());
+ deleteSdrObjectSafeAndClearPointer(pInvisibleSquare);
+
+ pObj = pPage->RemoveObjectFromSdrObjList(pObj->GetNavigationPosition());
+ deleteSdrObjectSafeAndClearPointer(pObj);
}
}
}
@@ -1077,12 +1086,12 @@ void SvxLineTabPage::Reset( const SfxIte
bPrevSym=sal_True;
}
}
+
if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),sal_True,&pPoolItem) == SFX_ITEM_SET)
{
aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize();
}
-
aSymbolRatioCB.Enable(bEnable);
aSymbolHeightFT.Enable(bEnable);
aSymbolWidthFT.Enable(bEnable);
@@ -1733,23 +1742,37 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl
SdrPage* pPage = new SdrPage( *pModel, sal_False );
pPage->SetPageScale(basegfx::B2DVector(1000.0, 1000.0));
pModel->InsertPage( pPage, 0 );
- // 3D View
+
+ // 3D View
SdrView* pView = new SdrView( *pModel, &aVDev );
pView->ShowSdrPage(*pPage);
PopupMenu* pPopup = new PopupMenu;
String aEmptyStr;
+
+ // Generate invisible square to give all symbols a
+ // bitmap size, which is indepedent from specific glyph
+ SdrObject *pInvisibleSquare = pSymbolList->GetObj(0);
+ pInvisibleSquare=pInvisibleSquare->CloneSdrObject();
+ pPage->InsertObjectToSdrObjList(*pInvisibleSquare);
+ pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100));
+ pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100));
+
for(long i=0;; ++i)
{
SdrObject *pObj=pSymbolList->GetObj(i);
- if(pObj==NULL)
+
+ if(!pObj)
+ {
break;
- pObj = pObj->CloneSdrObject();
- String *pStr=new String();
+ }
+
+ pObj = pObj->CloneSdrObject();
+ String *pStr = new String();
aGrfNames.Insert(pStr,LIST_APPEND);
pPage->InsertObjectToSdrObjList(*pObj);
- pView->MarkObj(*pObj);
- if(pSymbolAttr)
+
+ if(pSymbolAttr)
{
pObj->SetMergedItemSet(*pSymbolAttr);
}
@@ -1757,11 +1780,13 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl
{
pObj->SetMergedItemSet(rOutAttrs);
}
-
+
+ pView->MarkAll();
BitmapEx aBitmapEx(pView->GetMarkedObjBitmapEx());
GDIMetaFile aMeta(pView->GetMarkedObjMetaFile());
pView->UnmarkAll();
- pObj=pPage->RemoveObjectFromSdrObjList(0);
+
+ pObj = pPage->RemoveObjectFromSdrObjList(pObj->GetNavigationPosition());
deleteSdrObjectSafeAndClearPointer(pObj);
SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH);
@@ -1784,6 +1809,10 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl
Image aImage(aBitmapEx);
pPopup->InsertItem(pInfo->nItemId,*pStr,aImage);
}
+
+ pInvisibleSquare = pPage->RemoveObjectFromSdrObjList(pInvisibleSquare->GetNavigationPosition());
+ deleteSdrObjectSafeAndClearPointer(pInvisibleSquare);
+
aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_SYMBOLS, pPopup );
if(!aGrfNames.Count())
aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, sal_False);
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml Wed Jun 27 13:44:09 2012
@@ -107,10 +107,10 @@
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:DBNewForm" menu:helpid="12305" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewReport" menu:helpid="12316" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewQuery" menu:helpid="38873" menu:label="" />
- <menu:menuitem menu:id=".uno:DBNewQuerySql" menu:helpid="38841" menu:label="" />
+ <menu:menuitem menu:id=".uno:DBNewForm"/>
+ <menu:menuitem menu:id=".uno:DBNewReport"/>
+ <menu:menuitem menu:id=".uno:DBNewQuery"/>
+ <menu:menuitem menu:id=".uno:DBNewQuerySql"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DBNewTable"/>
<menu:menuitem menu:id=".uno:DBNewView"/>
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,8 +21,8 @@
*
***********************************************************-->
<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:DBStatusType" statusbar:align="left" statusbar:autosize="true" statusbar:width="50" statusbar:helpid="helpid:12308"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusDBName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12309"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusUserName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12310"/>
- <statusbar:statusbaritem xlink:href=".uno:DBStatusHostName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70" statusbar:helpid="helpid:12311"/>
+ <statusbar:statusbaritem xlink:href=".uno:DBStatusType" statusbar:align="left" statusbar:autosize="true" statusbar:width="50"/>
+ <statusbar:statusbaritem xlink:href=".uno:DBStatusDBName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70"/>
+ <statusbar:statusbaritem xlink:href=".uno:DBStatusUserName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70"/>
+ <statusbar:statusbaritem xlink:href=".uno:DBStatusHostName" statusbar:align="left" statusbar:autosize="true" statusbar:width="70"/>
</statusbar:statusbar>
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,8 +23,8 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DBFormOpen" toolbar:helpid="helpid:12286" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormEdit" toolbar:helpid="helpid:12285" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormDelete" toolbar:helpid="helpid:12283" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBFormRename" toolbar:helpid="helpid:12284" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBFormOpen"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormEdit"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBFormRename"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/queryobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,8 +23,8 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DBQueryOpen" toolbar:helpid="helpid:12282" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryEdit" toolbar:helpid="helpid:12281" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryDelete" toolbar:helpid="helpid:12279" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBQueryRename" toolbar:helpid="helpid:12280" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryOpen"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryEdit"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryRename"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/reportobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,8 +23,8 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DBReportOpen" toolbar:helpid="helpid:12290" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportEdit" toolbar:helpid="helpid:12289" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportDelete" toolbar:helpid="helpid:12287" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBReportRename" toolbar:helpid="helpid:12288" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBReportOpen"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportEdit"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBReportRename"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/tableobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,8 +23,8 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:DBTableOpen" toolbar:helpid="helpid:12278" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableEdit" toolbar:helpid="helpid:12277" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableDelete" toolbar:helpid="helpid:12275" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBTableRename" toolbar:helpid="helpid:12276" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBTableOpen"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableEdit"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBTableRename"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbapp/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -24,18 +24,18 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
<toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:text="" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Sortup"/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBNewForm" toolbar:helpid="helpid:5500" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:DBNewForm" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:helpid="helpid:5411" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
<toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,33 +23,33 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSave"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecUndo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSearch"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="helpid:10714" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:OrderCrit"/>
+ <toolbar:toolbaritem xlink:href=".uno:Sortup"/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="helpid:10716" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AutoFilter"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFiltered"/>
+ <toolbar:toolbaritem xlink:href=".uno:FilterCrit"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBInsertColumns" toolbar:helpid="helpid:12202" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBInsertContent" toolbar:helpid="helpid:12201" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBFormLetter" toolbar:helpid="helpid:12203" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBDocumentDataSource" toolbar:helpid="helpid:12252" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DSBrowserExplorer" toolbar:helpid="helpid:10764" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DSBInsertColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBInsertContent"/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBFormLetter"/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBDocumentDataSource"/>
+ <toolbar:toolbaritem xlink:href=".uno:DSBrowserExplorer"/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,10 +23,10 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:AddTable" toolbar:helpid="helpid:10722" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AddTable"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBViewFunctions" toolbar:helpid="helpid:12297" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBViewTableNames" toolbar:helpid="helpid:12298" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBViewAliases" toolbar:helpid="helpid:12299" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:DBDistinctValues" toolbar:helpid="helpid:12300" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBViewFunctions"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBViewTableNames"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBViewAliases"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBDistinctValues"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,5 +23,5 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SbaNativeSql" toolbar:helpid="helpid:10720" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:SbaNativeSql"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbquery/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,20 +23,20 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:text="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SbaExecuteSql" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBChangeDesignMode" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:SbaExecuteSql"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBChangeDesignMode"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBClearQuery" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBClearQuery"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbrelation/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AddTable" toolbar:helpid="helpid:10722" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:DBAddRelation" toolbar:helpid="helpid:12296" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AddTable"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBAddRelation"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtable/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,17 +23,17 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="helpid:5505" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502" toolbar:text="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DBIndexDesign" toolbar:helpid="helpid:12251" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:DBIndexDesign"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" toolbar:helpid="helpid:5701" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" toolbar:helpid="helpid:5700" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,27 +23,27 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:RecSave" toolbar:helpid="helpid:38991" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSave"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc" toolbar:helpid="helpid:6312" toolbar:text="" toolbar:style="" />
+ <toolbar:toolbaritem xlink:href=".uno:DSBEditDoc"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" toolbar:helpid="helpid:5710" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:helpid="helpid:5712" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecUndo" toolbar:helpid="helpid:38992" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecUndo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RecSearch" toolbar:helpid="helpid:10725" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RecSearch"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:helpid="helpid:10724" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Refresh" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:OrderCrit" toolbar:helpid="helpid:10714" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:Sortup" toolbar:helpid="helpid:10712" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:SortDown" toolbar:helpid="helpid:10713" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:OrderCrit"/>
+ <toolbar:toolbaritem xlink:href=".uno:Sortup"/>
+ <toolbar:toolbaritem xlink:href=".uno:SortDown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFilter" toolbar:helpid="helpid:10716" toolbar:text="" />
- <toolbar:toolbaritem xlink:href=".uno:FormFiltered" toolbar:helpid="helpid:10723" toolbar:text="" toolbar:style="" />
- <toolbar:toolbaritem xlink:href=".uno:FilterCrit" toolbar:helpid="helpid:10715" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:AutoFilter"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormFiltered"/>
+ <toolbar:toolbaritem xlink:href=".uno:FilterCrit"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort" toolbar:helpid="helpid:10711" toolbar:text="" />
+ <toolbar:toolbaritem xlink:href=".uno:RemoveFilterSort"/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/desktop/os2/source/applauncher/launcher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/os2/source/applauncher/launcher.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/desktop/os2/source/applauncher/launcher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/desktop/os2/source/applauncher/launcher.cxx Wed Jun 27 13:44:09 2012
@@ -54,10 +54,14 @@ int main( int argc, char* argv[])
DosQueryModuleName(pib->pib_hmte, sizeof(szApplicationName), szApplicationName);
// adjust libpath
+#if OSL_DEBUG_LEVEL > 0
+ rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
+ fprintf( stderr, "1 BeginLibPath: %s\n", szLibpath);
+#endif
_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
char* basedir = strstr( szDir, "\\PROGRAM\\");
if (basedir) *basedir = 0;
- sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%BeginLIBPATH%",
+ sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;",
szDrive, szDir, szDrive, szDir);
DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
// make sure we load DLL from our path only, so multiple instances/versions
@@ -67,6 +71,10 @@ int main( int argc, char* argv[])
// java cannot load with this flag enabled
DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT);
#endif
+#if OSL_DEBUG_LEVEL > 0
+ rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
+ fprintf( stderr, "2 BeginLibPath: %s\n", szLibpath);
+#endif
// adjust exe name
_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
Modified: incubator/ooo/branches/alg/aw080/main/desktop/source/deployment/manager/dp_extensionmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/source/deployment/manager/dp_extensionmanager.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/desktop/source/deployment/manager/dp_extensionmanager.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/desktop/source/deployment/manager/dp_extensionmanager.cxx Wed Jun 27 13:44:09 2012
@@ -1183,6 +1183,10 @@ uno::Sequence< uno::Sequence<Reference<d
addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled_prereg"));
+ // Create the tmp repository to trigger its clean up (deletion
+ // of old temporary data.)
+ getTmpRepository();
+
//copy the values of the map to a vector for sorting
::std::vector< ::std::vector<Reference<deploy::XPackage> > >
vecExtensions;
Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/drawinglayer/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/drawinglayer/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx Wed Jun 27 13:44:09 2012
@@ -150,7 +150,7 @@ namespace drawinglayer
}
const geometry::ViewInformation2D aViewInformation2D(aViewInformationSequence);
- const double fFactor100th_mmToInch(2.54/1000.0);
+ const double fFactor100th_mmToInch(1.0 / (2.54 * 1000.0));
const sal_uInt32 nDiscreteWidth(basegfx::fround((fWidth * fFactor100th_mmToInch) * DPI_X));
const sal_uInt32 nDiscreteHeight(basegfx::fround((fHeight * fFactor100th_mmToInch) * DPI_Y));
Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/zbufferprocessor3d.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/zbufferprocessor3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/zbufferprocessor3d.cxx Wed Jun 27 13:44:09 2012
@@ -124,11 +124,11 @@ namespace
}
}
}
-
- delete pContent;
- delete pAlpha;
}
+ delete pContent;
+ delete pAlpha;
+
aRetval = BitmapEx(aContent, aAlpha);
// #i101811# set PrefMapMode and PrefSize at newly created Bitmap
Modified: incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.cxx Wed Jun 27 13:44:09 2012
@@ -298,8 +298,9 @@ void SAL_CALL Os2Clipboard::setContents(
debug_printf("Os2Clipboard::setContents UnsupportedFlavorException (no bitmap)\n");
}
- // copy to clipboard
- if ( UWinOpenClipbrd( hAB) && (pSharedText || hbm))
+ // copy to clipboard only if we have data available, otherwise clipboard
+ // remains in use and locks all other applications.
+ if ( (pSharedText || hbm) && UWinOpenClipbrd( hAB) )
{
// set the flag, so we will ignore the next WM_DRAWCLIPBOARD
// since we generate it with following code.
Modified: incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Clipboard.hxx Wed Jun 27 13:44:09 2012
@@ -40,7 +40,7 @@
#define OS2_CLIPBOARD_SERVICE_NAME "com.sun.star.datatransfer.clipboard.SystemClipboard"
// the implementation names
-#define OS2_CLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.Os2Clipboard"
+#define OS2_CLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32"
// the registry key names
#define OS2_CLIPBOARD_REGKEY_NAME "/com.sun.star.datatransfer.clipboard.Os2Clipboard/UNO/SERVICES/com.sun.star.datatransfer.clipboard.SystemClipboard"
Modified: incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Transferable.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Transferable.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Transferable.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/dtrans/source/os2/clipb/Os2Transferable.hxx Wed Jun 27 13:44:09 2012
@@ -38,9 +38,8 @@
#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
-#if OSL_DEBUG_LEVEL>1
-//extern "C" int debug_printf(const char *f, ...);
-#define debug_printf( ...) { 1; }
+#if OSL_DEBUG_LEVEL>10
+extern "C" int debug_printf(const char *f, ...);
#else
#define debug_printf( ...) { 1; }
#endif
Modified: incubator/ooo/branches/alg/aw080/main/dtrans/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/dtrans/util/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/dtrans/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/dtrans/util/makefile.mk Wed Jun 27 13:44:09 2012
@@ -29,6 +29,9 @@ TARGET1=mcnttype
TARGET2=ftransl
TARGET3=sysdtrans
TARGET4=dnd
+.IF "$(GUI)"=="OS2"
+TARGET3=sysdtran
+.ENDIF
# --- Settings -----------------------------------------------------
Modified: incubator/ooo/branches/alg/aw080/main/editeng/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/editeng/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/editeng/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/editeng/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/editobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/editobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/editobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/editobj.cxx Wed Jun 27 13:44:09 2012
@@ -211,6 +211,10 @@ ContentInfo::ContentInfo( const ContentI
aAttribs.Insert( pMyAttr, aAttribs.Count() );
}
+ // memory leak #119992: to release pWrongs cloned from rCopyFrom
+ if (pWrongs != NULL)
+ delete pWrongs;
+
// Wrongs
pWrongs = NULL;
#ifndef SVX_LIGHT
Modified: incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/impedit3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/impedit3.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/impedit3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/editeng/source/editeng/impedit3.cxx Wed Jun 27 13:44:09 2012
@@ -2899,6 +2899,9 @@ void ImpEditEngine::Paint( OutputDevice*
sal_uInt16 nLines = pPortion->GetLines().Count();
sal_uInt16 nLastLine = nLines-1;
+ // #108052#
+ bool bEndOfParagraphWritten(false);
+
if ( !IsVertical() )
aStartPos.Y() += pPortion->GetFirstLineOffset();
else
@@ -2909,7 +2912,9 @@ void ImpEditEngine::Paint( OutputDevice*
const SvxLineSpacingItem& rLSItem = ((const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
- for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
+ bool bPaintBullet (false);
+
+ for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
{
pLine = pPortion->GetLines().GetObject(nLine);
DBG_ASSERT( pLine, "NULL-Pointer im Zeileniterator in UpdateViews" );
@@ -2930,7 +2935,7 @@ void ImpEditEngine::Paint( OutputDevice*
if ( ( !IsVertical() && ( aStartPos.Y() > aClipRec.Top() ) )
|| ( IsVertical() && aStartPos.X() < aClipRec.Right() ) )
{
- bool bPaintBullet (false);
+ bPaintBullet = false;
// Why not just also call when stripping portions? This will give the correct values
// and needs no position corrections in OutlinerEditEng::DrawingText which tries to call
@@ -2952,32 +2957,6 @@ void ImpEditEngine::Paint( OutputDevice*
// --------------------------------------------------
nIndex = pLine->GetStart();
- // #i108052# When stripping a callback for empty paragraphs is needed. This
- // was somehow lost/removed/killed by making the TextPortions with empty
- // paragraph to type PORTIONKIND_TAB instead of PORTIONKIND_TEXT. Adding here
- // since I could not find out who and why this has
- // changed.
- // #i118881#: Do not include the empty paragraph
- // after a bullet. Otherwise the wrong paragraph
- // indices will eventually find their way into
- // metafiles and break the association between
- // paragraphs and Impress animations.
- if(!bPaintBullet && bStripOnly && pLine->GetStartPortion() == pLine->GetEndPortion())
- {
- const Color aOverlineColor(pOutDev->GetOverlineColor());
- const Color aTextLineColor(pOutDev->GetTextLineColor());
-
- GetEditEnginePtr()->DrawingText(
- aTmpPos, String(), 0, 0, 0,
- aTmpFont, n, nIndex, 0,
- 0,
- 0,
- false, true, false, // support for EOL/EOP TEXT comments
- 0,
- aOverlineColor,
- aTextLineColor);
- }
-
for ( sal_uInt16 y = pLine->GetStartPortion(); y <= pLine->GetEndPortion(); y++ )
{
DBG_ASSERT( pPortion->GetTextPortions().Count(), "Zeile ohne Textportion im Paint!" );
@@ -3325,6 +3304,12 @@ void ImpEditEngine::Paint( OutputDevice*
&aLocale,
aOverlineColor,
aTextLineColor);
+
+ // #108052# remember that EOP is written already for this ParaPortion
+ if(bEndOfParagraph)
+ {
+ bEndOfParagraphWritten = true;
+ }
}
else
{
@@ -3580,6 +3565,27 @@ void ImpEditEngine::Paint( OutputDevice*
else
aStartPos.X() -= nUL;
}
+
+ // #108052# Safer way for #i108052# and #i118881#: If for the current ParaPortion
+ // EOP is not written, do it now. This will be safer than before. It has shown
+ // that the reason for #i108052# was fixed/removed again, so this is a try to fix
+ // the number of paragraphs (and counting empty ones) now independent from the
+ // changes in EditEngine behaviour.
+ if(!bEndOfParagraphWritten && !bPaintBullet && bStripOnly)
+ {
+ const Color aOverlineColor(pOutDev->GetOverlineColor());
+ const Color aTextLineColor(pOutDev->GetTextLineColor());
+
+ GetEditEnginePtr()->DrawingText(
+ aTmpPos, String(), 0, 0, 0,
+ aTmpFont, n, nIndex, 0,
+ 0,
+ 0,
+ false, true, false, // support for EOL/EOP TEXT comments
+ 0,
+ aOverlineColor,
+ aTextLineColor);
+ }
}
else
{
Modified: incubator/ooo/branches/alg/aw080/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/editeng/source/uno/unonrule.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/editeng/source/uno/unonrule.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/editeng/source/uno/unonrule.cxx Wed Jun 27 13:44:09 2012
@@ -298,18 +298,9 @@ void SvxUnoNumberingRules::setNumberingR
sal_Int16 nSet = sal_Int16();
aVal >>= nSet;
- switch(nSet)
+ // There is no reason to limit numbering types.
+ if ( nSet>=0 )
{
- case SVX_NUM_BITMAP:
- case SVX_NUM_CHAR_SPECIAL:
- case SVX_NUM_ROMAN_UPPER:
- case SVX_NUM_ROMAN_LOWER:
- case SVX_NUM_CHARS_UPPER_LETTER:
- case SVX_NUM_CHARS_LOWER_LETTER:
- case SVX_NUM_ARABIC:
- case SVX_NUM_NUMBER_NONE:
- case SVX_NUM_CHARS_UPPER_LETTER_N:
- case SVX_NUM_CHARS_LOWER_LETTER_N:
aFmt.SetNumberingType(nSet);
continue;
}
Modified: incubator/ooo/branches/alg/aw080/main/extensions/source/activex/main/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/extensions/source/activex/main/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/extensions/source/activex/main/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/extensions/source/activex/main/makefile.mk Wed Jun 27 13:44:09 2012
@@ -80,6 +80,7 @@ SHL1STDLIBS=\
.IF "$(COM)"!="GCC"
.IF "$(CCNUMVER)" > "001300000000"
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
+ SHL1STDLIBS+= $(ATL_LIB)$/atlthunk.lib
.ENDIF
.ENDIF
Modified: incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/msdffimp.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/msdffimp.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/msdffimp.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/msdffimp.hxx Wed Jun 27 13:44:09 2012
@@ -451,7 +451,6 @@ protected :
sal_Int64 nAspect ) const;
// <--
SdrObject* GetAutoForm( MSO_SPT eTyp ) const;
- static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf );
#ifndef SVX_LIGHT
static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj(
sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
Modified: incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/svdfppt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/svdfppt.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/svdfppt.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/svdfppt.hxx Wed Jun 27 13:44:09 2012
@@ -870,6 +870,14 @@ struct ImplPPTCharPropSet
struct PPTCharPropSet
{
+ //when the bullet text has more than two color,next the text following with bullet has been set hyperlink.
+ //now,the bullet color should be set original hyperlink text's color
+ //so "mbHardHylinkOrigColor" hold the original hyperlink text's color.
+ sal_uInt32 mnHylinkOrigColor;
+ //the bullet text weather has a hyperlink.
+ sal_Bool mbIsHyperlink;
+ //the hyperlink text weather has a custom color.
+ sal_Bool mbHardHylinkOrigColor;
sal_uInt32 mnOriginalTextPos;
sal_uInt32 mnParagraph;
Modified: incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/eos2met/eos2met.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/eos2met/eos2met.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/eos2met/eos2met.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/eos2met/eos2met.cxx Wed Jun 27 13:44:09 2012
@@ -2590,18 +2590,6 @@ sal_Bool METWriter::WriteMET( const GDIM
extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
{ METWriter aMETWriter;
- if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
- return aMETWriter.WriteMET( rGraphic.GetGDIMetaFile(), rStream, pFilterConfigItem );
- else
- {
- Bitmap aBmp=rGraphic.GetBitmap();
- GDIMetaFile aMTF;
- VirtualDevice aVirDev;
-
- aMTF.Record(&aVirDev);
- aVirDev.DrawBitmap(Point(),aBmp);
- aMTF.Stop();
- aMTF.SetPrefSize(aBmp.GetSizePixel());
- return aMETWriter.WriteMET( aMTF, rStream, pFilterConfigItem );
- }
+ // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+ return aMETWriter.WriteMET( rGraphic.GetGDIMetaFile(), rStream, pFilterConfigItem );
}
Modified: incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/epict/epict.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/epict/epict.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/epict/epict.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/graphicfilter/epict/epict.cxx Wed Jun 27 13:44:09 2012
@@ -2291,41 +2291,9 @@ extern "C" sal_Bool __LOADONCALLAPI Grap
{
PictWriter aPictWriter;
- if (rGraphic.GetType()==GRAPHIC_GDIMETAFILE)
- {
- GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
+ // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+ GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
-/*
- MapMode aMap72( MAP_INCH );
- Fraction aDPIFrac( 1, 72 );
- Size aOldSize = aScaledMtf.GetPrefSize();
-
- aMap72.SetScaleX( aDPIFrac );
- aMap72.SetScaleY( aDPIFrac );
-
- Size aNewSize = OutputDevice::LogicToLogic( aOldSize,
- aScaledMtf.GetPrefMapMode(),
- aMap72 );
-
- aScaledMtf.Scale( Fraction( aNewSize.Width(), aOldSize.Width() ),
- Fraction( aNewSize.Height(), aOldSize.Height() ) );
- aScaledMtf.SetPrefMapMode( aMap72 );
- aScaledMtf.SetPrefSize( aNewSize );
-*/
-
- return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
- }
- else
- {
- Bitmap aBmp=rGraphic.GetBitmap();
- GDIMetaFile aMTF;
- VirtualDevice aVirDev;
-
- aMTF.Record(&aVirDev);
- aVirDev.DrawBitmap(Point(),aBmp);
- aMTF.Stop();
- aMTF.SetPrefSize(aBmp.GetSizePixel());
- return aPictWriter.WritePict( aMTF, rStream, pFilterConfigItem );
- }
+ return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
}
Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx Wed Jun 27 13:44:09 2012
@@ -30,6 +30,7 @@
#include <svx/svdoashp.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdmodel.hxx>
+#include <editeng/outlobj.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
#include <vcl/cvtgrf.hxx>
@@ -995,6 +996,15 @@ void EscherPropertyContainer::CreateLine
}
}
AddOpt( ESCHER_Prop_lineJoinStyle, eLineJoin );
+
+ if ( EscherPropertyValueHelper::GetPropertyValue(
+ aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LineTransparence" ) ), sal_True ) )
+ {
+ sal_Int16 nTransparency = 0;
+ if ( aAny >>= nTransparency )
+ AddOpt( ESCHER_Prop_lineOpacity, ( ( 100 - nTransparency ) << 16 ) / 100 );
+ }
+
if ( bEdge == sal_False )
{
@@ -2035,8 +2045,12 @@ sal_Int32 GetValueForEnhancedCustomShape
{
case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
- nValue = (sal_uInt16)rEquationOrder[ nValue ];
- nValue |= (sal_uInt32)0x80000000;
+ OSL_ASSERT(nValue < rEquationOrder.size());
+ if ( nValue < rEquationOrder.size() )
+ {
+ nValue = (sal_uInt16)rEquationOrder[ nValue ];
+ nValue |= (sal_uInt32)0x80000000;
+ }
}
break;
case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
@@ -3066,6 +3080,15 @@ void EscherPropertyContainer::CreateCust
}
}
}
+ if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) ), sal_True ) )
+ {
+ float fCharHeight = 0.0;
+ if ( aAny >>= fCharHeight )
+ {
+ sal_Int32 nTextSize = static_cast< sal_Int32 > ( fCharHeight * 65536 );
+ AddOpt(ESCHER_Prop_gtextSize, nTextSize);
+ }
+ }
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "CharKerning" ) ), sal_True ) )
{
sal_Int16 nCharKerning = sal_Int16();
@@ -3103,6 +3126,12 @@ void EscherPropertyContainer::CreateCust
}
}
}
+ if((nTextPathFlags & 0x4000) != 0) //Is Font work
+ {
+ OutlinerParaObject* pOutlinerParaObject = pCustoShape->GetOutlinerParaObject();
+ if ( pOutlinerParaObject && pOutlinerParaObject->IsVertical() )
+ nTextPathFlags |= 0x2000;
+ }
if ( nTextPathFlags != nTextPathFlagsOrg )
AddOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags );
}