You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [15/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu Sun Feb 3 13:23:59 2013
@@ -21,7 +21,7 @@
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
- <value xml:lang="x-translate">%productname% %formatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
+ <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document (%productname% Writer/Web)</value>
</prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Zeichnung</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Zeichnung</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Präsentation</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Präsentation</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Formel</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Formel</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_DOS_StarWriter.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (DOS) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (DOS) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (DOS) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_Lotus_1_2_3_10_WIN_StarWriter.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>Lotus 1-2-3 1.0 (WIN) (StarWriter)</value></prop>
<prop oor:name="UIName">
- <value>Lotus 1-2-3 1.0 (WIN) (%productname% %formatversion% Writer)</value>
+ <value>Lotus 1-2-3 1.0 (WIN) (%productname% Writer)</value>
</prop>
<prop oor:name="ClipboardFormat"/>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Textdokument</value>
+ <value>%oooxmlformatname% %oooxmlformatversion% Textdokument</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_30.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 3.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 3.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 3.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 3.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_40.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 4.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 4.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 4.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 4.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu (original)
+++ openoffice/branches/l10n/main/filter/source/config/fragments/types/writer_StarWriter_50.xcu Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarWriter 5.0</value></prop>
<prop oor:name="UIName">
- <value>StarWriter 5.0 (%productname% %formatversion% Globaldokument)</value>
+ <value>StarWriter 5.0 (%productname% Globaldokument)</value>
</prop>
<prop oor:name="ClipboardFormat"><value>StarWriter 5.0</value></prop>
</node>
Modified: openoffice/branches/l10n/main/filter/source/graphicfilter/eos2met/eos2met.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/graphicfilter/eos2met/eos2met.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/graphicfilter/eos2met/eos2met.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/graphicfilter/eos2met/eos2met.cxx Sun Feb 3 13:23:59 2013
@@ -19,13 +19,10 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
#include <svtools/fltcall.hxx>
-
#include <math.h>
#include <tools/stream.hxx>
#include <tools/bigint.hxx>
@@ -42,6 +39,7 @@
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
#include <vcl/gdimetafiletools.hxx>
+#include <vcl/dibtools.hxx>
// -----------------------------Feld-Typen-------------------------------
@@ -569,7 +567,7 @@ void METWriter::WriteImageObject(const B
WriteFieldId(nActBitmapId);
// Windows-BMP-Datei erzeugen:
- aTemp << rBitmap;
+ WriteDIB(rBitmap, aTemp, false, true);
// Header der Windows-BMP-Datei einlesen:
aTemp.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
Modified: openoffice/branches/l10n/main/filter/source/graphicfilter/ios2met/ios2met.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/graphicfilter/ios2met/ios2met.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/graphicfilter/ios2met/ios2met.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/graphicfilter/ios2met/ios2met.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
@@ -29,7 +27,7 @@
#include <vcl/virdev.hxx>
#include <vcl/lineinfo.hxx>
#include <svtools/fltcall.hxx>
-
+#include <vcl/dibtools.hxx>
#include <math.h>
// MT: NOOLDSV, someone should change the code...
@@ -2392,7 +2390,7 @@ void OS2METReader::ReadField(sal_uInt16
}
pBitmapList->pBMP->Seek(0);
- pBitmapList->aBitmap.Read( *( pBitmapList->pBMP ), sal_False );
+ ReadDIB(pBitmapList->aBitmap, *(pBitmapList->pBMP), false);
if (pBitmapList->pBMP->GetError()!=0) {
pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
Modified: openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx Sun Feb 3 13:23:59 2013
@@ -140,6 +140,7 @@ using namespace vos;
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include "svx/EnhancedCustomShape2d.hxx"
+#include <vcl/dibtools.hxx>
using namespace ::com::sun::star ;
using namespace ::com::sun::star::drawing;
@@ -6650,7 +6651,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect(
if( ( nInst & 0xFFFE ) == 0x7A8 )
{ // DIBs direkt holen
Bitmap aNew;
- if( aNew.Read( *pGrStream, sal_False ) )
+ if( ReadDIB(aNew, *pGrStream, false) )
{
rData = Graphic( aNew );
nRes = GRFILTER_OK;
Modified: openoffice/branches/l10n/main/forms/source/component/Columns.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/forms/source/component/Columns.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/forms/source/component/Columns.cxx (original)
+++ openoffice/branches/l10n/main/forms/source/component/Columns.cxx Sun Feb 3 13:23:59 2013
@@ -116,7 +116,7 @@ sal_Int32 getColumnTypeByModelName(const
: aModelName.copy(aCompatibleModelPrefix.getLength());
const StringSequence& rColumnTypes = getColumnTypes();
- nTypeId = ::detail::findPos(aColumnType, rColumnTypes);
+ nTypeId = ::forms_detail::findPos(aColumnType, rColumnTypes);
}
return nTypeId;
}
Modified: openoffice/branches/l10n/main/forms/source/component/Grid.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/forms/source/component/Grid.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/forms/source/component/Grid.cxx (original)
+++ openoffice/branches/l10n/main/forms/source/component/Grid.cxx Sun Feb 3 13:23:59 2013
@@ -374,7 +374,7 @@ void OGridControlModel::removeSelectionC
Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes();
- return createColumn( detail::findPos( ColumnType, rColumnTypes ) );
+ return createColumn( forms_detail::findPos( ColumnType, rColumnTypes ) );
}
//------------------------------------------------------------------------------
Modified: openoffice/branches/l10n/main/forms/source/component/ImageControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/forms/source/component/ImageControl.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/forms/source/component/ImageControl.cxx (original)
+++ openoffice/branches/l10n/main/forms/source/component/ImageControl.cxx Sun Feb 3 13:23:59 2013
@@ -925,7 +925,7 @@ void OImageControlControl::mousePressed(
if ( impl_isEmptyGraphics_nothrow() )
xMenu->enableItem( ID_CLEAR_GRAPHICS, sal_False );
- awt::Rectangle aRect( e.X, e.Y, 0, 0 );
+ awt::Point aPos( e.X, e.Y );
if ( ( e.X < 0 ) || ( e.Y < 0 ) )
{ // context menu triggered by keyboard
// position it in the center of the control
@@ -935,12 +935,12 @@ void OImageControlControl::mousePressed(
if ( xWindow.is() )
{
awt::Rectangle aPosSize = xWindow->getPosSize();
- aRect.X = aPosSize.Width / 2;
- aRect.Y = aPosSize.Height / 2;
+ aPos.X = aPosSize.Width / 2;
+ aPos.Y = aPosSize.Height / 2;
}
}
- const sal_Int16 nResult = xMenu->execute( xWindowPeer, aRect, PopupMenuDirection::EXECUTE_DEFAULT );
+ const sal_Int16 nResult = xMenu->execute( xWindowPeer, aPos, PopupMenuDirection::EXECUTE_DEFAULT );
switch ( nResult )
{
Modified: openoffice/branches/l10n/main/forms/source/component/findpos.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/forms/source/component/findpos.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/forms/source/component/findpos.cxx (original)
+++ openoffice/branches/l10n/main/forms/source/component/findpos.cxx Sun Feb 3 13:23:59 2013
@@ -35,7 +35,7 @@
#include <algorithm>
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
Modified: openoffice/branches/l10n/main/forms/source/component/findpos.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/forms/source/component/findpos.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/forms/source/component/findpos.hxx (original)
+++ openoffice/branches/l10n/main/forms/source/component/findpos.hxx Sun Feb 3 13:23:59 2013
@@ -30,7 +30,7 @@
namespace rtl { class OUString; }
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
Modified: openoffice/branches/l10n/main/formula/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/formula/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/formula/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/formula/util/makefile.mk Sun Feb 3 13:23:59 2013
@@ -92,11 +92,7 @@ SHL2STDLIBS= \
$(CPPUHELPERLIB) \
$(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
- $(LB)$/ifor.lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL2STDLIBS+= \
-lfor$(DLLPOSTFIX)
SHL2DEPN=$(SHL1TARGETN)
Modified: openoffice/branches/l10n/main/fpicker/source/office/iodlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/fpicker/source/office/iodlg.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/fpicker/source/office/iodlg.cxx (original)
+++ openoffice/branches/l10n/main/fpicker/source/office/iodlg.cxx Sun Feb 3 13:23:59 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_fpicker.hxx"
@@ -97,6 +95,7 @@
#include "fpinteraction.hxx"
#include <osl/process.h>
#include <comphelper/interaction.hxx>
+#include <vcl/dibtools.hxx>
#include <algorithm>
#include <functional>
@@ -3123,7 +3122,7 @@ void SvtFileDialog::setImage( sal_Int16
SvMemoryStream aData( aBmpSequence.getArray(),
aBmpSequence.getLength(),
STREAM_READ );
- aData >> aBmp;
+ ReadDIB(aBmp, aData, true);
_pPrevBmp->SetBitmap( aBmp );
}
Modified: openoffice/branches/l10n/main/framework/Library_fwk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/Library_fwk.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/Library_fwk.mk (original)
+++ openoffice/branches/l10n/main/framework/Library_fwk.mk Sun Feb 3 13:23:59 2013
@@ -145,6 +145,7 @@ $(eval $(call gb_Library_add_exception_o
framework/source/uielement/controlmenucontroller \
framework/source/uielement/dropdownboxtoolbarcontroller \
framework/source/uielement/edittoolbarcontroller \
+ framework/source/uielement/genericstatusbarcontroller \
framework/source/uielement/generictoolbarcontroller \
framework/source/uielement/imagebuttontoolbarcontroller \
framework/source/uielement/langselectionstatusbarcontroller \
@@ -158,7 +159,9 @@ $(eval $(call gb_Library_add_exception_o
framework/source/uielement/recentfilesmenucontroller \
framework/source/uielement/spinfieldtoolbarcontroller \
framework/source/uielement/statusbar \
+ framework/source/uielement/statusbaritem \
framework/source/uielement/statusbarmanager \
+ framework/source/uielement/statusbarmerger \
framework/source/uielement/statusbarwrapper \
framework/source/uielement/statusindicatorinterfacewrapper \
framework/source/uielement/togglebuttontoolbarcontroller \
Modified: openoffice/branches/l10n/main/framework/Library_fwl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/Library_fwl.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/Library_fwl.mk (original)
+++ openoffice/branches/l10n/main/framework/Library_fwl.mk Sun Feb 3 13:23:59 2013
@@ -71,12 +71,9 @@ $(eval $(call gb_Library_add_exception_o
framework/source/uielement/footermenucontroller \
framework/source/uielement/headermenucontroller \
framework/source/uielement/langselectionmenucontroller \
- framework/source/uielement/logoimagestatusbarcontroller \
- framework/source/uielement/logotextstatusbarcontroller \
framework/source/uielement/macrosmenucontroller \
framework/source/uielement/newmenucontroller \
framework/source/uielement/popupmenucontroller \
- framework/source/uielement/simpletextstatusbarcontroller \
framework/source/uielement/toolbarsmenucontroller \
))
Modified: openoffice/branches/l10n/main/framework/inc/classes/filtercachedata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/classes/filtercachedata.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/classes/filtercachedata.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/classes/filtercachedata.hxx Sun Feb 3 13:23:59 2013
@@ -84,12 +84,6 @@ namespace framework{
#define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names
#define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names
-#define PRODUCTNAME_VARIABLE DECLARE_ASCII("%productname%")
-#define PRODUCTNAME_VARLENGTH 13
-#define PRODUCTNAME_FALLBACK DECLARE_ASCII("StarOffice" ) /// fallback, if configuration can't give us current set product name ...
-#define FORMATVERSION_VARIABLE DECLARE_ASCII("%formatversion%" )
-#define FORMATVERSION_VARLENGTH 15
-#define FORMATVERSION_FALLBACK DECLARE_ASCII("6.0/7" )
//*****************************************************************************************************************
// We know some default values ...
Modified: openoffice/branches/l10n/main/framework/inc/classes/resource.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/classes/resource.hrc?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/classes/resource.hrc (original)
+++ openoffice/branches/l10n/main/framework/inc/classes/resource.hrc Sun Feb 3 13:23:59 2013
@@ -37,7 +37,7 @@
#define STR_SAVECOPYDOC (RID_STR_START+5)
#define STR_NODOCUMENT (RID_STR_START+6)
#define STR_TOOLBAR_TITLE_ADDON (RID_STR_START+7)
-#define STR_STATUSBAR_LOGOTEXT (RID_STR_START+8)
+
#define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by AuotSave to show error state: full disc
#define STR_FULL_DISC_MSG (RID_STR_START+10) // used by AuotSave to show error state: full disc
#define STR_RESTORE_TOOLBARS (RID_STR_START+11)
@@ -64,8 +64,6 @@
#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5
#define MENUITEM_TOOLBAR_CLOSE 6
-#define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0)
-
// License Dialog
#define DLG_LICENSE (RID_FWK_DIALOG_START+256)
#define ML_LICENSE (RID_FWK_DIALOG_START+11)
Modified: openoffice/branches/l10n/main/framework/inc/dispatch/mailtodispatcher.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/dispatch/mailtodispatcher.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/dispatch/mailtodispatcher.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/dispatch/mailtodispatcher.hxx Sun Feb 3 13:23:59 2013
@@ -93,15 +93,13 @@ class MailToDispatcher : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~MailToDispatcher( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/l10n/main/framework/inc/dispatch/systemexec.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/dispatch/systemexec.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/dispatch/systemexec.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/dispatch/systemexec.hxx Sun Feb 3 13:23:59 2013
@@ -93,15 +93,13 @@ class SystemExec : // interfaces
{
/* member */
private:
-
- /// reference to global uno service manager which had created us
- css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/* interface */
public:
// ctor/dtor
- SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+ SystemExec( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~SystemExec( );
// XInterface, XTypeProvider, XServiceInfo
Modified: openoffice/branches/l10n/main/framework/inc/framework/addonsoptions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/framework/addonsoptions.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/framework/addonsoptions.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/framework/addonsoptions.hxx Sun Feb 3 13:23:59 2013
@@ -52,6 +52,10 @@
#define ADDONSMENUITEM_STRING_CONTROLTYPE "ControlType"
#define ADDONSMENUITEM_STRING_WIDTH "Width"
+#define STATUSBARITEM_STRING_ALIGN "Alignment"
+#define STATUSBARITEM_STRING_AUTOSIZE "AutoSize"
+#define STATUSBARITEM_STRING_OWNERDRAW "OwnerDraw"
+
#define ADDONSMENUITEM_URL_LEN 3
#define ADDONSMENUITEM_TITLE_LEN 5
#define ADDONSMENUITEM_TARGET_LEN 6
@@ -68,6 +72,10 @@
#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE ))
#define ADDONSMENUITEM_PROPERTYNAME_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH ))
+#define STATUSBARITEM_PROPERTYNAME_ALIGN ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STATUSBARITEM_STRING_ALIGN ))
+#define STATUSBARITEM_PROPERTYNAME_AUTOSIZE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STATUSBARITEM_STRING_AUTOSIZE ))
+#define STATUSBARITEM_PROPERTYNAME_OWNERDRAW ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STATUSBARITEM_STRING_OWNERDRAW ))
+
#define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon"
#define ADDONSPOPUPMENU_URL_PREFIX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR ))
@@ -101,6 +109,18 @@ struct FWE_DLLPUBLIC MergeToolbarInstruc
typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer;
+struct FWE_DLLPUBLIC MergeStatusbarInstruction
+{
+ ::rtl::OUString aMergePoint;
+ ::rtl::OUString aMergeCommand;
+ ::rtl::OUString aMergeCommandParameter;
+ ::rtl::OUString aMergeFallback;
+ ::rtl::OUString aMergeContext;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > aMergeStatusbarItems;
+};
+
+typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionContainer;
+
//_________________________________________________________________________________________________________________
// forward declarations
//_________________________________________________________________________________________________________________
@@ -259,6 +279,13 @@ class FWE_DLLPUBLIC AddonsOptions
const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
+ /**
+ * @short Gets the UI name of a single addon toolbar
+ * @return The UI name of the toolbar as specified in the Addons.xcu configuration
+ * @onerror Returns an empty string
+ */
+ const ::rtl::OUString GetAddonsToolbarUIName( sal_uInt32 nIndex ) const;
+
/*-****************************************************************************************************//**
@short Retrieves all available merge instructions for the Office menu bar
@descr -
@@ -284,6 +311,8 @@ class FWE_DLLPUBLIC AddonsOptions
*//*-*****************************************************************************************************/
bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const;
+ const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const;
+
/*-****************************************************************************************************//**
@short Gets the Add-On help menu part of all addon components registered
@descr -
Modified: openoffice/branches/l10n/main/framework/inc/pch/precompiled_framework.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/pch/precompiled_framework.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/pch/precompiled_framework.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/pch/precompiled_framework.hxx Sun Feb 3 13:23:59 2013
@@ -222,7 +222,7 @@
#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
#include "com/sun/star/sync2/BadPartnershipException.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
#include "com/sun/star/task/ErrorCodeRequest.hpp"
#include "com/sun/star/task/XAsyncJob.hpp"
#include "com/sun/star/task/XInteractionAbort.hpp"
Modified: openoffice/branches/l10n/main/framework/inc/services.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/services.h?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/services.h (original)
+++ openoffice/branches/l10n/main/framework/inc/services.h Sun Feb 3 13:23:59 2013
@@ -72,7 +72,6 @@ namespace framework{
#define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" )
#define SERVICENAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.frame.DispatchRecorderSupplier" )
#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" )
-#define SERVICENAME_SYSTEMSHELLEXECUTE DECLARE_ASCII("com.sun.star.system.SystemShellExecute" )
#define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" )
#define SERVICENAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.util.PathSubstitution" )
#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" )
@@ -195,13 +194,10 @@ namespace framework{
#define IMPLEMENTATIONNAME_SESSIONLISTENER DECLARE_ASCII("com.sun.star.comp.frame.SessionListener" )
#define IMPLEMENTATIONNAME_HELPONSTARTUP DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" )
#define IMPLEMENTATIONNAME_SHELLJOB DECLARE_ASCII("com.sun.star.comp.framework.ShellJob" )
-#define IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LogoImageStatusbarController" )
-#define IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LogoTextStatusbarController" )
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR DECLARE_ASCII("com.sun.star.comp.framework.TaskCreator" )
#define IMPLEMENTATIONNAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.comp.framework.TabWindowFactory" )
#define IMPLEMENTATIONNAME_TABWINDOW DECLARE_ASCII("com.sun.star.comp.framework.TabWindow" )
#define IMPLEMENTATIONNAME_SYSTEMEXEC DECLARE_ASCII("com.sun.star.comp.framework.SystemExecute" )
-#define IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.SimpleTextStatusbarController" )
#define IMPLEMENTATIONNAME_URIABBREVIATION DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" )
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LangSelectionStatusbarController" )
Modified: openoffice/branches/l10n/main/framework/inc/uielement/controlmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/controlmenucontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/controlmenucontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/controlmenucontroller.hxx Sun Feb 3 13:23:59 2013
@@ -77,7 +77,7 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/l10n/main/framework/inc/uielement/fontmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/fontmenucontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/fontmenucontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/fontmenucontroller.hxx Sun Feb 3 13:23:59 2013
@@ -71,7 +71,7 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/l10n/main/framework/inc/uielement/langselectionstatusbarcontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/langselectionstatusbarcontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/langselectionstatusbarcontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/langselectionstatusbarcontroller.hxx Sun Feb 3 13:23:59 2013
@@ -49,39 +49,21 @@ class LangSelectionStatusbarController :
explicit LangSelectionStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
// XServiceInfo
- DECLARE_XSERVICEINFO
-
- // XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
+ DECLARE_XSERVICEINFO
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
- // XComponent
- virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
- // XEventListener
- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
-
+
// XStatusbarController
- virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
- ::sal_Int32 nCommand,
- ::sal_Bool bMouseEvent,
+ virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
+ ::sal_Int32 nCommand,
+ ::sal_Bool bMouseEvent,
const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
- const ::com::sun::star::awt::Rectangle& rOutputRectangle,
- ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
-
+ virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
+
private:
virtual ~LangSelectionStatusbarController() {}
LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined
@@ -95,7 +77,7 @@ class LangSelectionStatusbarController :
::rtl::OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed
LanguageGuessingHelper m_aLangGuessHelper;
- void LangMenu() throw (::com::sun::star::uno::RuntimeException);
+ void LangMenu( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException);
};
} // framework namespace
Modified: openoffice/branches/l10n/main/framework/inc/uielement/newmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/newmenucontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/newmenucontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/newmenucontroller.hxx Sun Feb 3 13:23:59 2013
@@ -86,8 +86,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/l10n/main/framework/inc/uielement/recentfilesmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/recentfilesmenucontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/recentfilesmenucontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/recentfilesmenucontroller.hxx Sun Feb 3 13:23:59 2013
@@ -51,8 +51,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XDispatchProvider
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/l10n/main/framework/inc/uielement/statusbarmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/statusbarmanager.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/statusbarmanager.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/statusbarmanager.hxx Sun Feb 3 13:23:59 2013
@@ -53,6 +53,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <vcl/status.hxx>
+#include <map>
namespace framework
{
@@ -117,7 +118,7 @@ class StatusBarManager : public ::com::s
void MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL ::com::sun::star::frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&));
protected:
- typedef std::vector< ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > StatusBarControllerVector;
+ typedef std::map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > StatusBarControllerMap;
sal_Bool m_bDisposed : 1,
m_bFrameActionRegistered : 1,
@@ -128,7 +129,7 @@ class StatusBarManager : public ::com::s
rtl::OUString m_aResourceName;
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame;
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels;
- StatusBarControllerVector m_aControllerVector;
+ StatusBarControllerMap m_aControllerMap;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerRegistration > m_xStatusbarControllerRegistration;
Modified: openoffice/branches/l10n/main/framework/inc/uielement/toolbarsmenucontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/inc/uielement/toolbarsmenucontroller.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/inc/uielement/toolbarsmenucontroller.hxx (original)
+++ openoffice/branches/l10n/main/framework/inc/uielement/toolbarsmenucontroller.hxx Sun Feb 3 13:23:59 2013
@@ -81,8 +81,8 @@ namespace framework
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
// XMenuListener
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/l10n/main/framework/qa/complex/XUserInputInterception/EventTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/XUserInputInterception/EventTest.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/XUserInputInterception/EventTest.java (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/XUserInputInterception/EventTest.java Sun Feb 3 13:23:59 2013
@@ -314,7 +314,7 @@ public class EventTest {
* <CODE>m_keyReleased</CODE> are <CODE>TRUE</CODE>
* @param xUII the XUserInputInterception
* @param xModel the XModel of a document
- * @see EventTest.MyKeyHander
+ * @see EventTest.MyKeyHandler
* @see EventTest.EventTrigger
*/
private void checkKeyListener(XUserInputInterception xUII, XModel xModel) {
@@ -620,4 +620,4 @@ public class EventTest {
private static final OfficeConnection connection = new OfficeConnection();
-}
\ No newline at end of file
+}
Modified: openoffice/branches/l10n/main/framework/qa/complex/api_internal/api.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/api_internal/api.lst?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/api_internal/api.lst (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/api_internal/api.lst Sun Feb 3 13:23:59 2013
@@ -2,7 +2,6 @@ job1=cached.CachedContentResultSetFactor
job2=cached.CachedContentResultSetStubFactory
job3=cached.CachedDynamicResultSetFactory
job4=cached.CachedDynamicResultSetStubFactory
-job5=cmdmail.SimpleCommandMail
job6=corereflection.uno.CoreReflection
job7=dbaccess.DBContentLoader
job8=dbaccess.OCommandDefinition
@@ -64,7 +63,6 @@ job63=mcnttype.MimeContentTypeFactory
job64=namingservice.uno.NamingService
job65=nestedreg.uno.NestedRegistry
job66=proxyfac.uno.ProxyFactory
-job67=proxyset.SOffice52ProxySettings
job68=regtypeprov.uno.RegistryTypeDescriptionProvider
job69=remotebridge.uno.various
job70=sc.AccessibleEditableTextPara_HeaderFooter
Modified: openoffice/branches/l10n/main/framework/qa/complex/api_internal/worksforme.sce
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/api_internal/worksforme.sce?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/api_internal/worksforme.sce (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/api_internal/worksforme.sce Sun Feb 3 13:23:59 2013
@@ -18,9 +18,7 @@
# under the License.
#
# *************************************************************
-job=cmdmail.SimpleCommandMail
job=fileacc.SimpleFileAccess
-job=proxyset.SOffice52ProxySettings
job=sc.ScCellFieldObj
job=sc.ScCellFieldsObj
job=sc.XMLImporter
Modified: openoffice/branches/l10n/main/framework/qa/complex/framework/autosave/Protocol.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/framework/autosave/Protocol.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/framework/autosave/Protocol.java (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/framework/autosave/Protocol.java Sun Feb 3 13:23:59 2013
@@ -531,7 +531,7 @@ public class Protocol extends JComponent
* @param sMessage
* the pure message
*
- * @see log(type,message)
+ * @see #log(int, String)
*/
public synchronized void log( /*IN*/ String sMessage )
{
@@ -761,8 +761,8 @@ public class Protocol extends JComponent
*
* @return A string, which includes the whole header.
*
- * @see finish()
- * @see generateHTMLFooter()
+ * @see #finish()
+ * @see #impl_generateHTMLFooter()
*/
private String impl_generateHTMLHeader()
{
@@ -791,7 +791,7 @@ public class Protocol extends JComponent
* @param sOut
* used to generate the log output there.
*
- * @param lProps/aProp
+ * @param lProps
* represent the property(array) to be logged.
*/
private void impl_logPropertyArray( /*OUT*/ StringBuffer sOut ,
Modified: openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTest.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTest.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTest.java (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTest.java Sun Feb 3 13:23:59 2013
@@ -532,7 +532,7 @@ public class RecoveryTest extends Comple
/**
* This function uses accessibility to handle the dialog "Are you sure".
- * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
+ * It click "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
* @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
* "No".
*/
@@ -551,8 +551,8 @@ public class RecoveryTest extends Comple
/**
* This function uses accessibility to handle the dialog "Are you sure".
- * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
- * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
+ * It click "Yes" or "No", depending on the value of the parameter <CODE>Yes</CODE>
+ * @param saveDocuments If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
* "No".
*/
private void handleSaveDocumentsDialog(boolean saveDocuments)
Modified: openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTools.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTools.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTools.java (original)
+++ openoffice/branches/l10n/main/framework/qa/complex/framework/recovery/RecoveryTools.java Sun Feb 3 13:23:59 2013
@@ -147,7 +147,6 @@ public class RecoveryTools {
/**
* remove the content of the user backup folder and removes the Recovery.xcu. This
* was done from the Office via XSimpleFileAccess
- * @param xMSF a <CODE>XMultiServiceFactory</CODE> to get <CODE>XSimpleFileAccess</CODE>
* @throws com.sun.star.io.IOException the exception was thrown if something goes wrong.
*/
public void cleanRecoveryData()
@@ -359,4 +358,4 @@ public class RecoveryTools {
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/l10n/main/framework/source/classes/resource.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/source/classes/resource.src?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/source/classes/resource.src (original)
+++ openoffice/branches/l10n/main/framework/source/classes/resource.src Sun Feb 3 13:23:59 2013
@@ -128,11 +128,6 @@ String STR_TOOLBAR_TITLE_ADDON
Text [ en-US ] = "Add-On %num%";
};
-String STR_STATUSBAR_LOGOTEXT
-{
- Text [ en-US ] = "A %PRODUCTNAME product by Oracle";
-};
-
// ***********************************************************************
// License Dialog
// ***********************************************************************
@@ -285,12 +280,6 @@ ModalDialog DLG_LICENSE
};
-Image RID_IMAGE_STATUSBAR_LOGO
-{
- ImageBitmap = Bitmap { File = "logo.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
-};
-
String STR_FULL_DISC_RETRY_BUTTON
{
Text [ en-US ] = "Retry" ;
Modified: openoffice/branches/l10n/main/framework/source/dispatch/mailtodispatcher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/source/dispatch/mailtodispatcher.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/source/dispatch/mailtodispatcher.cxx (original)
+++ openoffice/branches/l10n/main/framework/source/dispatch/mailtodispatcher.cxx Sun Feb 3 13:23:59 2013
@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
@@ -84,10 +84,10 @@ DEFINE_XTYPEPROVIDER_5(MailToDispatcher
css::frame::XNotifyingDispatch,
css::frame::XDispatch )
-DEFINE_XSERVICEINFO_MULTISERVICE(MailToDispatcher ,
- ::cppu::OWeakObject ,
- SERVICENAME_PROTOCOLHANDLER ,
- IMPLEMENTATIONNAME_MAILTODISPATCHER)
+DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher ,
+ ::cppu::OWeakObject ,
+ SERVICENAME_PROTOCOLHANDLER ,
+ IMPLEMENTATIONNAME_MAILTODISPATCHER)
DEFINE_INIT_SERVICE(MailToDispatcher,
{
@@ -105,17 +105,17 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
@short standard ctor
@descr These initialize a new instance of ths class with needed informations for work.
- @param xFactory
- reference to uno servicemanager for creation of new services
+ @param xContext
+ reference to uno component context
@modified 30.04.2002 14:10, as96863
*/
-MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext )
// Init baseclasses first
: ThreadHelpBase( &Application::GetSolarMutex() )
, OWeakObject ( )
// Init member
- , m_xFactory ( xFactory )
+ , m_xContext ( xContext )
{
}
@@ -129,7 +129,7 @@ MailToDispatcher::MailToDispatcher( cons
*/
MailToDispatcher::~MailToDispatcher()
{
- m_xFactory = NULL;
+ m_xContext = NULL;
}
//_________________________________________________________________________________________________________________
@@ -266,13 +266,14 @@ sal_Bool MailToDispatcher::implts_dispat
{
sal_Bool bSuccess = sal_False;
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory;
+ css::uno::Reference< css::uno::XComponentContext > xContext;
/* SAFE */{
ReadGuard aReadLock( m_aLock );
- xFactory = m_xFactory;
+ xContext = m_xContext;
/* SAFE */}
- css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute( xFactory->createInstance(SERVICENAME_SYSTEMSHELLEXECUTE), css::uno::UNO_QUERY );
+ css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+ css::system::SystemShellExecute::create( xContext ) );
if (xSystemShellExecute.is())
{
try
Modified: openoffice/branches/l10n/main/framework/source/dispatch/systemexec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/framework/source/dispatch/systemexec.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/framework/source/dispatch/systemexec.cxx (original)
+++ openoffice/branches/l10n/main/framework/source/dispatch/systemexec.cxx Sun Feb 3 13:23:59 2013
@@ -35,7 +35,7 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
@@ -85,10 +85,10 @@ DEFINE_XTYPEPROVIDER_5(SystemExec
css::frame::XNotifyingDispatch,
css::frame::XDispatch )
-DEFINE_XSERVICEINFO_MULTISERVICE(SystemExec ,
- ::cppu::OWeakObject ,
- SERVICENAME_PROTOCOLHANDLER ,
- IMPLEMENTATIONNAME_SYSTEMEXEC)
+DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec ,
+ ::cppu::OWeakObject ,
+ SERVICENAME_PROTOCOLHANDLER ,
+ IMPLEMENTATIONNAME_SYSTEMEXEC)
DEFINE_INIT_SERVICE(SystemExec,
{
@@ -102,12 +102,12 @@ DEFINE_INIT_SERVICE(SystemExec,
//_________________________________________________________________________________________________________________
-SystemExec::SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& xContext )
// Init baseclasses first
: ThreadHelpBase( &Application::GetSolarMutex() )
, OWeakObject ( )
// Init member
- , m_xFactory ( xFactory )
+ , m_xContext ( xContext )
{
}
@@ -115,7 +115,7 @@ SystemExec::SystemExec( const css::uno::
SystemExec::~SystemExec()
{
- m_xFactory = NULL;
+ m_xContext = NULL;
}
//_________________________________________________________________________________________________________________
@@ -171,7 +171,7 @@ void SAL_CALL SystemExec::dispatchWithNo
// SAFE ->
ReadGuard aReadLock(m_aLock);
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory;
+ css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
aReadLock.unlock();
// <- SAFE
@@ -180,14 +180,14 @@ void SAL_CALL SystemExec::dispatchWithNo
try
{
css::uno::Reference< css::util::XStringSubstitution > xPathSubst(
- xFactory->createInstance(SERVICENAME_SUBSTITUTEPATHVARIABLES),
+ xContext->getServiceManager()->createInstanceWithContext(
+ SERVICENAME_SUBSTITUTEPATHVARIABLES, xContext),
css::uno::UNO_QUERY_THROW);
::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists !
css::uno::Reference< css::system::XSystemShellExecute > xShell(
- xFactory->createInstance(SERVICENAME_SYSTEMSHELLEXECUTE),
- css::uno::UNO_QUERY_THROW);
+ css::system::SystemShellExecute::create(xContext));
xShell->execute(sSystemURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS);
impl_notifyResultListener(xListener, css::frame::DispatchResultState::SUCCESS);