You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/04/23 11:51:53 UTC
svn commit: r1470868 [6/40] - in /openoffice/branches/ia2: ./
ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/
extras/l10n/source/fi/ main/ main/animations/source/animcore/
main/automation/source/communi/ main/basctl/source/basicide/ m...
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
<prop oor:name="UIName">
<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
- <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
<prop oor:name="UIName">
<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
- <value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% HTML Template</value>
</prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
<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/ia2/main/filter/source/config/fragments/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/makefile.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/makefile.mk (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/makefile.mk Tue Apr 23 09:51:15 2013
@@ -60,18 +60,6 @@ REALFILTERPACKAGES_TYPES_FLAG = \
$(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.types_flag \
$(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.types_flag
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_TYPES_FLAG += \
- $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_web_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_global_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.types_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_math_bf.types_flag
-.ENDIF
-
REALFILTERPACKAGES_FILTERS_FLAG = \
$(DIR_FILTERCFGOUT)$/fcfg_base.filters_flag \
$(DIR_FILTERCFGOUT)$/fcfg_writer.filters_flag \
@@ -91,18 +79,6 @@ REALFILTERPACKAGES_FILTERS_FLAG = \
$(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.filters_flag \
$(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.filters_flag
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_FILTERS_FLAG += \
- $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_web_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_global_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.filters_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_math_bf.filters_flag
-.ENDIF
-
REALFILTERPACKAGES_FILTERS_UI_MERGE = \
$(DIR_LOCMERGE)$/filter_ui.xcu
@@ -131,18 +107,6 @@ REALFILTERPACKAGES_OTHERS_FLAG = \
$(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.others_flag \
$(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.others_flag
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_OTHERS_FLAG += \
- $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_web_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_global_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.others_flag \
- $(DIR_FILTERCFGOUT)$/fcfg_math_bf.others_flag
-.ENDIF
-
INTERNALFILTERPACKAGES_TYPES_FLAG = \
$(DIR_FILTERCFGOUT)$/fcfg_internalgraphics.types_flag
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/packagedef.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/packagedef.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/packagedef.mk (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/packagedef.mk Tue Apr 23 09:51:15 2013
@@ -52,16 +52,4 @@ INCLUDE_FRAGMENTS = \
$(PRJ)$/source$/config$/fragments$/fcfg_impressgraphics.mk \
$(PRJ)$/source$/config$/fragments$/fcfg_internalgraphics.mk
-.IF "$(WITH_BINFILTER)" != "NO"
-INCLUDE_FRAGMENTS += \
- $(PRJ)$/source$/config$/fragments$/fcfg_writer_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_web_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_global_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_calc_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_draw_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_impress_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_chart_bf.mk \
- $(PRJ)$/source$/config$/fragments$/fcfg_math_bf.mk
-.ENDIF
-
.INCLUDE: $(INCLUDE_FRAGMENTS)
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/calc_NSO_UOF2.xcu Tue Apr 23 09:51:15 2013
@@ -28,7 +28,6 @@
<prop oor:name="PreferredFilter"><value>NSO Calc UOF2</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">Uniform Office Format 2 spreadsheet</value>
- <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2 å·¥ä½ç°¿</value>
</prop>
<prop oor:name="ClipboardFormat"><value>doctype:uos:UOF2</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/impress_NSO_UOF2.xcu Tue Apr 23 09:51:15 2013
@@ -28,7 +28,6 @@
<prop oor:name="PreferredFilter"><value>NSO Impress UOF2</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">Uniform Office Format 2 presentation</value>
- <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2 æ¼ç¤ºæ稿</value>
</prop>
<prop oor:name="ClipboardFormat"><value>doctype:uop:UOF2</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/types/writer_NSO_UOF2.xcu Tue Apr 23 09:51:15 2013
@@ -28,7 +28,6 @@
<prop oor:name="PreferredFilter"><value>NSO Writer UOF2</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">Uniform Office Format 2 text</value>
- <value xml:lang="zh-CN">ä¸æåå
¬è½¯ä»¶ææ¡£æ ¼å¼2 åå¤çææ¡£</value>
</prop>
<prop oor:name="ClipboardFormat"><value>doctype:uot:UOF2</value></prop>
</node>
Modified: openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/msfilter/msdffimp.cxx Tue Apr 23 09:51:15 2013
@@ -1024,11 +1024,11 @@ void DffPropertyReader::ApplyLineAttribu
if ( eShapeType == mso_sptMin )
eLineJointDefault = mso_lineJoinRound;
MSO_LineJoin eLineJoint = (MSO_LineJoin)GetPropertyValue( DFF_Prop_lineJoinStyle, eLineJointDefault );
- XLineJoint eXLineJoint( XLINEJOINT_MITER );
+ com::sun::star::drawing::LineJoint eXLineJoint( com::sun::star::drawing::LineJoint_MITER );
if ( eLineJoint == mso_lineJoinBevel )
- eXLineJoint = XLINEJOINT_BEVEL;
+ eXLineJoint = com::sun::star::drawing::LineJoint_BEVEL;
else if ( eLineJoint == mso_lineJoinRound )
- eXLineJoint = XLINEJOINT_ROUND;
+ eXLineJoint = com::sun::star::drawing::LineJoint_ROUND;
rSet.Put( XLineJointItem( eXLineJoint ) );
if ( nLineFlags & 0x10 )
@@ -1709,7 +1709,7 @@ void DffPropertyReader::ApplyCustomShape
{
const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
double fBackDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeBackward, 1270 * 360 )) / 360.0;
- double fForeDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeForward ), 0 ) / 360.0;
+ double fForeDepth = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DExtrudeForward, 0 )) / 360.0;
double fDepth = fBackDepth + fForeDepth;
double fFraction = fDepth != 0.0 ? fForeDepth / fDepth : 0;
EnhancedCustomShapeParameterPair aDepthParaPair;
Modified: openoffice/branches/ia2/main/filter/source/msfilter/msocximex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/msfilter/msocximex.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/msfilter/msocximex.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/msfilter/msocximex.cxx Tue Apr 23 09:51:15 2013
@@ -5306,7 +5306,7 @@ sal_Bool OCX_Image::Read(SotStorageStrea
pS->Seek( imagePos );
- sImageUrl = C2U("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
+ sImageUrl = C2U("vnd.sun.star.expand:${$OOO_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
sal_uInt8* pImage = new sal_uInt8[ nImageLen ];
pS->Read(pImage, nImageLen);
Modified: openoffice/branches/ia2/main/filter/source/pdf/impdialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/pdf/impdialog.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/pdf/impdialog.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/pdf/impdialog.cxx Tue Apr 23 09:51:15 2013
@@ -576,22 +576,7 @@ void ImpPDFTabGeneralPage::SetFilterConf
maCbExportEmptyPages.Check( !paParent->mbIsSkipEmptyPages );
- Reference< XMultiServiceFactory > xFactory = paParent->getServiceFactory();
- Reference< XInterface > xIfc;
- if( xFactory.is() )
- {
- xIfc = xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.documents.PDFDetector" ) ) );
- }
- if( xIfc.is() )
- {
- maCbAddStream.Show( sal_True );
- maCbAddStream.Check( paParent->mbAddStream );
- }
- else
- {
- maCbAddStream.Show( sal_False );
- maCbAddStream.Check( sal_False );
- }
+ maCbAddStream.Check( paParent->mbAddStream );
maCbAddStream.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleAddStreamHdl ) );
// init addstream dependencies
ToggleAddStreamHdl( NULL );
@@ -611,7 +596,7 @@ void ImpPDFTabGeneralPage::GetFilterConf
paParent->mbExportBookmarks = maCbExportBookmarks.IsChecked();
paParent->mbIsSkipEmptyPages = !maCbExportEmptyPages.IsChecked();
- paParent->mbAddStream = maCbAddStream.IsVisible() && maCbAddStream.IsChecked();
+ paParent->mbAddStream = maCbAddStream.IsChecked();
paParent->mbIsRangeChecked = sal_False;
if( maRbRange.IsChecked() )
@@ -688,25 +673,21 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleR
// -----------------------------------------------------------------------------
IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG )
{
- if( maCbAddStream.IsVisible() )
+ if( maCbAddStream.IsChecked() )
{
- if( maCbAddStream.IsChecked() )
- {
- maRbAll.Check();
- maRbRange.Enable( sal_False );
- maRbSelection.Enable( sal_False );
- maEdPages.Enable( sal_False );
- //Sym2_5805, When the control is disabled, it is also readonly. So here, it is not necessary to set it as readonly.
- //maEdPages.SetReadOnly( sal_True );
- maRbAll.Enable( sal_False );
- }
- else
- {
- maRbAll.Enable( sal_True );
- maRbRange.Enable( sal_True );
- maRbSelection.Enable( sal_True );
- }
+ maRbAll.Check();
+ maRbRange.Enable( sal_False );
+ maRbSelection.Enable( sal_False );
+ maEdPages.Enable( sal_False );
+ maRbAll.Enable( sal_False );
}
+ else
+ {
+ maRbAll.Enable( sal_True );
+ maRbRange.Enable( sal_True );
+ maRbSelection.Enable( sal_True );
+ }
+
return 0;
}
Modified: openoffice/branches/ia2/main/filter/source/pdf/impdialog.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/pdf/impdialog.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/pdf/impdialog.src (original)
+++ openoffice/branches/ia2/main/filter/source/pdf/impdialog.src Tue Apr 23 09:51:15 2013
@@ -257,7 +257,7 @@ TabPage RID_PDF_TAB_GENER
Pos = MAP_APPFONT ( 12 , 261 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
- Text[ en-US ] = "Create ~hybrid file";
+ Text[ en-US ] = "Embed this document ~inside the PDF";
};
};
Modified: openoffice/branches/ia2/main/filter/source/xsltfilter/uof2splithandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/xsltfilter/uof2splithandler.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/xsltfilter/uof2splithandler.cxx (original)
+++ openoffice/branches/ia2/main/filter/source/xsltfilter/uof2splithandler.cxx Tue Apr 23 09:51:15 2013
@@ -48,8 +48,8 @@ using namespace ::rtl;
UOF2SplitHandler::UOF2SplitHandler(
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMultiFactory,
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rStream )
-: m_rMultiFactory( rMultiFactory )
-, m_rStream( rStream )
+: m_rStream( rStream )
+, m_rMultiFactory( rMultiFactory )
, m_bIsStart( sal_False )
{
_Init();
@@ -240,4 +240,4 @@ void UOF2SplitHandler::namespaceMap( con
}
}
}
-}
\ No newline at end of file
+}
Modified: openoffice/branches/ia2/main/formula/source/core/api/token.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/core/api/token.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/core/api/token.cxx (original)
+++ openoffice/branches/ia2/main/formula/source/core/api/token.cxx Tue Apr 23 09:51:15 2013
@@ -28,11 +28,7 @@
// INCLUDE ---------------------------------------------------------------
-#if STLPORT_VERSION<321
-#include <stddef.h>
-#else
#include <cstddef>
-#endif
#include <cstdio>
#include <string.h>
Modified: openoffice/branches/ia2/main/formula/source/core/resource/core_resource.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/formula/source/core/resource/core_resource.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/formula/source/core/resource/core_resource.src (original)
+++ openoffice/branches/ia2/main/formula/source/core/resource/core_resource.src Tue Apr 23 09:51:15 2013
@@ -858,19 +858,19 @@ Resource RID_STRLIST_FUNCTION_NAMES
};
String SC_OPCODE_COSECANT
{
- Text = "CSC" ;
+ Text [ en-US ] = "CSC" ;
};
String SC_OPCODE_SECANT
{
- Text = "SEC" ;
+ Text [ en-US ] = "SEC" ;
};
String SC_OPCODE_COSECANT_HYP
{
- Text = "CSCH" ;
+ Text [ en-US ] = "CSCH" ;
};
String SC_OPCODE_SECANT_HYP
{
- Text = "SECH" ;
+ Text [ en-US ] = "SECH" ;
};
String SC_OPCODE_EXP
{
Modified: openoffice/branches/ia2/main/fpicker/source/aqua/CFStringUtilities.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/aqua/CFStringUtilities.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/aqua/CFStringUtilities.cxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/aqua/CFStringUtilities.cxx Tue Apr 23 09:51:15 2013
@@ -86,7 +86,7 @@ rtl::OUString CFURLRefToOUString(CFURLRe
sURLString = CFURLGetString(aUrlRef);
CFRetain(sURLString);
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
CFStringRef fullString = CFURLGetString(aUrlRef);
CFURLRef dirRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
@@ -95,14 +95,14 @@ rtl::OUString CFURLRefToOUString(CFURLRe
CFIndex fullLength = CFStringGetLength(fullString);
CFRange substringRange = CFRangeMake(dirLength, fullLength - dirLength);
sURLString = CFStringCreateWithSubstring(NULL, fullString, substringRange);
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
CFURLRef directoryRef = CFURLCreateCopyDeletingLastPathComponent(NULL,aUrlRef);
sURLString = CFURLGetString(directoryRef);
CFRetain(sURLString);
CFRelease(directoryRef);
- break;
+ } break;
default:
break;
}
Modified: openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.cxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.cxx Tue Apr 23 09:51:15 2013
@@ -217,7 +217,7 @@ OUString ControlHelper::getLabel( sal_In
return retVal;
}
-void ControlHelper::setLabel( sal_Int16 nControlId, const NSString* aLabel )
+void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
{
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", aLabel);
@@ -954,7 +954,7 @@ void ControlHelper::createFilterControl(
DBG_PRINT_EXIT(CLASS_NAME, __func__);
}
-NSTextField* ControlHelper::createLabelWithString(const NSString* labelString) {
+NSTextField* ControlHelper::createLabelWithString(NSString* labelString) {
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "label", labelString);
NSTextField *textField = [NSTextField new];
Modified: openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.hxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/aqua/ControlHelper.hxx Tue Apr 23 09:51:15 2013
@@ -62,7 +62,7 @@ public:
uno::Any getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const;
void enableControl( sal_Int16 nControlId, sal_Bool bEnable ) const;
OUString getLabel( sal_Int16 nControlId );
- void setLabel( sal_Int16 nControlId, const NSString* aLabel );
+ void setLabel( sal_Int16 nControlId, NSString* aLabel );
//------------------------------------------------------------------------------------
// other stuff
@@ -179,7 +179,7 @@ private:
void createControls();
void createFilterControl();
void createUserPane();
- NSTextField* createLabelWithString(const NSString* label);
+ NSTextField* createLabelWithString( NSString* label);
int getControlElementName(const Class clazz, const int nControlId) const;
NSControl* getControl( const sal_Int16 nControlId ) const;
Modified: openoffice/branches/ia2/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/aqua/NSURL_OOoAdditions.mm?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/aqua/NSURL_OOoAdditions.mm (original)
+++ openoffice/branches/ia2/main/fpicker/source/aqua/NSURL_OOoAdditions.mm Tue Apr 23 09:51:15 2013
@@ -40,9 +40,9 @@
sURLString = [self absoluteString];
[sURLString retain];
break;
- case FILENAME:
+ case FILENAME: {
OSL_TRACE("Extracting the file name of an item");
- NSString *path = [self path];
+ NSString* path = [self path];
if (path == nil) {
sURLString = @"";
}
@@ -50,10 +50,10 @@
sURLString = [path lastPathComponent];
}
[sURLString retain];
- break;
- case PATHWITHOUTLASTCOMPONENT:
+ } break;
+ case PATHWITHOUTLASTCOMPONENT: {
OSL_TRACE("Extracting the last but one component of an item's path");
- path = [self absoluteString];
+ NSString* path = [self absoluteString];
if (path == nil) {
sURLString = @"";
}
@@ -63,7 +63,7 @@
sURLString = [path substringToIndex:([path length] - lastLength)];
}
[sURLString retain];
- break;
+ } break;
default:
break;
}
Modified: openoffice/branches/ia2/main/fpicker/source/aqua/SalAquaPicker.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/aqua/SalAquaPicker.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/aqua/SalAquaPicker.cxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/aqua/SalAquaPicker.cxx Tue Apr 23 09:51:15 2013
@@ -109,7 +109,7 @@ void SAL_CALL SalAquaPicker::implInitial
[(NSOpenPanel*)m_pDialog setCanChooseFiles:YES];
break;
- case NAVIGATIONSERVICES_SAVE:
+ case NAVIGATIONSERVICES_SAVE: {
OSL_TRACE("NAVIGATIONSERVICES_SAVE");
m_pDialog = [NSSavePanel savePanel];
[(NSSavePanel*)m_pDialog setCanSelectHiddenExtension:NO]; //changed for issue #102102
@@ -128,7 +128,7 @@ void SAL_CALL SalAquaPicker::implInitial
OSL_TRACE("Hiding extension");
[pDefaults setBool:YES forKey:kSetHideExtensionStateKey];
}
- break;
+ } break;
case NAVIGATIONSERVICES_DIRECTORY:
OSL_TRACE("NAVIGATIONSERVICES_DIRECTORY");
Modified: openoffice/branches/ia2/main/framework/Library_fwk.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/Library_fwk.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/Library_fwk.mk (original)
+++ openoffice/branches/ia2/main/framework/Library_fwk.mk Tue Apr 23 09:51:15 2013
@@ -116,6 +116,7 @@ $(eval $(call gb_Library_add_exception_o
framework/source/services/backingcomp \
framework/source/services/backingwindow \
framework/source/services/desktop \
+ framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/frame \
framework/source/services/modelwinservice \
framework/source/services/modulemanager \
Modified: openoffice/branches/ia2/main/framework/inc/macros/registration.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/macros/registration.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/macros/registration.hxx (original)
+++ openoffice/branches/ia2/main/framework/inc/macros/registration.hxx Tue Apr 23 09:51:15 2013
@@ -102,7 +102,7 @@ ________________________________________
{ \
LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" ) \
/* Define variables which are used in following macros. */ \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory ; \
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xFactory ; \
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \
xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; \
/* These parameter will expand to */ \
Modified: openoffice/branches/ia2/main/framework/inc/properties.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/inc/properties.h?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/inc/properties.h (original)
+++ openoffice/branches/ia2/main/framework/inc/properties.h Tue Apr 23 09:51:15 2013
@@ -329,20 +329,6 @@ class PropHelper
return bChanged;
}
-
- //___________________________________________
-
- /** calculates the count of items inside the given ascii array.
- *
- * @param pArray must point to an array of items from type sal_Char
- *
- * @return The count of items inside this array, calculated by knowing the size of sal_Char.
- */
-
- static sal_Int32 calculatePropArrayCount( const sal_Char* pArray[] )
- {
- return (sal_Int32)(sizeof(pArray)/sizeof(sal_Char*));
- }
};
} // namespace framework
Modified: openoffice/branches/ia2/main/framework/source/classes/menumanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/classes/menumanager.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/classes/menumanager.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/classes/menumanager.cxx Tue Apr 23 09:51:15 2013
@@ -147,7 +147,8 @@ MenuManager::MenuManager(
m_xFrame = rFrame;
m_bInitialized = sal_False;
m_bIsBookmarkMenu = sal_False;
- SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
+
+ acquire();
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bWasHiContrast = rSettings.GetHighContrastMode();
Modified: openoffice/branches/ia2/main/framework/source/classes/resource.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/classes/resource.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/classes/resource.src (original)
+++ openoffice/branches/ia2/main/framework/source/classes/resource.src Tue Apr 23 09:51:15 2013
@@ -319,35 +319,28 @@ String STR_UNTITLED_DOCUMENT
String STR_LANGSTATUS_MULTIPLE_LANGUAGES
{
Text [ en-US ] = "Multiple Languages" ;
- Text [ x-comment ] = " ";
};
String STR_LANGSTATUS_NONE
{
Text [ en-US ] = "None (Do not check spelling)" ;
- Text [ x-comment ] = " ";
};
String STR_RESET_TO_DEFAULT_LANGUAGE
{
Text [ en-US ] = "Reset to Default Language" ;
- Text [ x-comment ] = " ";
};
String STR_LANGSTATUS_MORE
{
Text [ en-US ] = "More..." ;
- Text [ x-comment ] = " ";
};
String STR_SET_LANGUAGE_FOR_SELECTION
{
Text [ en-US ] = "Set Language for Selection" ;
- Text [ x-comment ] = " ";
};
String STR_SET_LANGUAGE_FOR_PARAGRAPH
{
Text [ en-US ] = "Set Language for Paragraph" ;
- Text [ x-comment ] = " ";
};
String STR_SET_LANGUAGE_FOR_ALL_TEXT
{
Text [ en-US ] = "Set Language for all Text" ;
- Text [ x-comment ] = " ";
};
Modified: openoffice/branches/ia2/main/framework/source/register/registerservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/register/registerservices.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/register/registerservices.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/register/registerservices.cxx Tue Apr 23 09:51:15 2013
@@ -53,26 +53,14 @@
#include <services/tabwindowservice.hxx>
#include <services/frame.hxx>
#include <services/modulemanager.hxx>
-//#include <dispatch/oxt_handler.hxx>
#include <jobs/jobexecutor.hxx>
-//#include <recording/dispatchrecordersupplier.hxx>
-//#include <recording/dispatchrecorder.hxx>
-//#include <dispatch/mailtodispatcher.hxx>
-//#include <dispatch/servicehandler.hxx>
#include <jobs/jobdispatch.hxx>
#include <services/backingcomp.hxx>
-//#include <services/dispatchhelper.hxx>
#include <services/layoutmanager.hxx>
-//#include <services/license.hxx>
#include <uifactory/uielementfactorymanager.hxx>
#include <uifactory/popupmenucontrollerfactory.hxx>
-//#include <uielement/fontmenucontroller.hxx>
-//#include <uielement/fontsizemenucontroller.hxx>
#include <uielement/objectmenucontroller.hxx>
-//#include <uielement/headermenucontroller.hxx>
-//#include <uielement/footermenucontroller.hxx>
#include <uielement/controlmenucontroller.hxx>
-//#include <uielement/macrosmenucontroller.hxx>
#include <uielement/uicommanddescription.hxx>
#include <uiconfiguration/uiconfigurationmanager.hxx>
#include <uiconfiguration/moduleuicfgsupplier.hxx>
@@ -84,7 +72,6 @@
#include <uifactory/toolboxfactory.hxx>
#include <uifactory/addonstoolboxfactory.hxx>
#include "uiconfiguration/windowstateconfiguration.hxx"
-//#include <uielement/toolbarsmenucontroller.hxx>
#include "uifactory/toolbarcontrollerfactory.hxx"
#include "uifactory/statusbarcontrollerfactory.hxx"
#include <services/autorecovery.hxx>
@@ -93,42 +80,27 @@
#include <uifactory/statusbarfactory.hxx>
#include <uiconfiguration/uicategorydescription.hxx>
#include <services/sessionlistener.hxx>
-//#include <uielement/newmenucontroller.hxx>
#include <services/taskcreatorsrv.hxx>
-//#include <services/uriabbreviation.hxx>
-
#include <uielement/langselectionstatusbarcontroller.hxx>
-//#include <uielement/langselectionmenucontroller.hxx>
#include <uiconfiguration/imagemanager.hxx>
#include <uifactory/windowcontentfactorymanager.hxx>
#include <services/substitutepathvars.hxx>
#include <services/pathsettings.hxx>
+#include <services/ContextChangeEventMultiplexer.hxx>
COMPONENTGETIMPLEMENTATIONENVIRONMENT
COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
IFFACTORY( ::framework::Desktop ) else
IFFACTORY( ::framework::Frame ) else
- //IFFACTORY( ::framework::Oxt_Handler ) else
IFFACTORY( ::framework::JobExecutor ) else
- //IFFACTORY( ::framework::DispatchRecorderSupplier ) else
- //IFFACTORY( ::framework::DispatchRecorder ) else
- //IFFACTORY( ::framework::MailToDispatcher ) else
- //IFFACTORY( ::framework::ServiceHandler ) else
IFFACTORY( ::framework::JobDispatch ) else
IFFACTORY( ::framework::BackingComp ) else
- //IFFACTORY( ::framework::DispatchHelper ) else
IFFACTORY( ::framework::LayoutManager ) else
- //IFFACTORY( ::framework::License ) else
IFFACTORY( ::framework::UIElementFactoryManager ) else
IFFACTORY( ::framework::PopupMenuControllerFactory ) else
- //IFFACTORY( ::framework::FontMenuController ) else
- //IFFACTORY( ::framework::FontSizeMenuController ) else
IFFACTORY( ::framework::ObjectMenuController ) else
- //IFFACTORY( ::framework::HeaderMenuController ) else
- //IFFACTORY( ::framework::FooterMenuController ) else
IFFACTORY( ::framework::ControlMenuController ) else
- //IFFACTORY( ::framework::MacrosMenuController ) else
IFFACTORY( ::framework::UICommandDescription ) else
IFFACTORY( ::framework::ModuleManager ) else
IFFACTORY( ::framework::UIConfigurationManager ) else
@@ -142,7 +114,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::frame
IFFACTORY( ::framework::AddonsToolBoxFactory ) else
IFFACTORY( ::framework::WindowStateConfiguration ) else
IFFACTORY( ::framework::ToolbarControllerFactory ) else
- //IFFACTORY( ::framework::ToolbarsMenuController ) else
IFFACTORY( ::framework::AutoRecovery ) else
IFFACTORY( ::framework::StatusIndicatorFactory ) else
IFFACTORY( ::framework::RecentFilesMenuController ) else
@@ -152,15 +123,12 @@ COMPONENTGETFACTORY ( IFFACTORY( ::frame
IFFACTORY( ::framework::StatusbarControllerFactory ) else
IFFACTORY( ::framework::SessionListener ) else
IFFACTORY( ::framework::TaskCreatorService ) else
- //IFFACTORY( ::framework::NewMenuController ) else
- //IFFACTORY( ::framework::UriAbbreviation ) else
- //IFFACTORY( ::framework::PopupMenuDispatcher ) else
IFFACTORY( ::framework::ImageManager ) else
IFFACTORY( ::framework::LangSelectionStatusbarController ) else
- //IFFACTORY( ::framework::LanguageSelectionMenuController ) else
IFFACTORY( ::framework::WindowContentFactoryManager ) else
IFFACTORY( ::framework::TabWindowService ) else
IFFACTORY( ::framework::SubstitutePathVariables ) else
- IFFACTORY( ::framework::PathSettings )
+ IFFACTORY( ::framework::PathSettings ) else
+ IFFACTORY( ::framework::ContextChangeEventMultiplexer )
)
Modified: openoffice/branches/ia2/main/framework/source/services/substitutepathvars.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/services/substitutepathvars.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/services/substitutepathvars.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/services/substitutepathvars.cxx Tue Apr 23 09:51:15 2013
@@ -1242,7 +1242,7 @@ void SubstitutePathVariables::SetPredefi
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
}
Modified: openoffice/branches/ia2/main/framework/util/fwk.component
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/util/fwk.component?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/util/fwk.component (original)
+++ openoffice/branches/ia2/main/framework/util/fwk.component Tue Apr 23 09:51:15 2013
@@ -45,6 +45,10 @@
<implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
<service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer">
+ <service name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+ <singleton name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
+ </implementation>
<implementation name="com.sun.star.comp.framework.Frame">
<service name="com.sun.star.frame.Frame"/>
</implementation>
Modified: openoffice/branches/ia2/main/helpcontent2/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/prj/build.lst?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/prj/build.lst (original)
+++ openoffice/branches/ia2/main/helpcontent2/prj/build.lst Tue Apr 23 09:51:15 2013
@@ -40,6 +40,7 @@ h2 helpcontent2\source\text\simpress\01
h2 helpcontent2\source\text\simpress\02 nmake - all helpcontent2_simp_02 helpcontent2_aux NULL
h2 helpcontent2\source\text\simpress\04 nmake - all helpcontent2_simp_04 helpcontent2_aux NULL
h2 helpcontent2\source\text\simpress\guide nmake - all helpcontent2_simp_guid helpcontent2_aux NULL
+h2 helpcontent2\source\text\simpress\minimizer nmake - all helpcontent2_simp_mini helpcontent2_aux NULL
h2 helpcontent2\source\text\smath nmake - all helpcontent2_smat helpcontent2_aux NULL
h2 helpcontent2\source\text\smath\00 nmake - all helpcontent2_smat_00 helpcontent2_aux NULL
h2 helpcontent2\source\text\smath\01 nmake - all helpcontent2_smat_01 helpcontent2_aux NULL
@@ -52,13 +53,13 @@ h2 helpcontent2\source\text\swriter\01
h2 helpcontent2\source\text\swriter\02 nmake - all helpcontent2_swri_02 helpcontent2_aux NULL
h2 helpcontent2\source\text\swriter\04 nmake - all helpcontent2_swri_04 helpcontent2_aux NULL
h2 helpcontent2\source\text\swriter\guide nmake - all helpcontent2_swri_guid helpcontent2_aux NULL
-h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\scalc nmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\sdraw nmake - all helpcontent2_ut_sdra helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\sdatabase nmake - all helpcontent2_ut_sdat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\shared nmake - all helpcontent2_ut_shar helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\simpress nmake - all helpcontent2_ut_simp helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\smath nmake - all helpcontent2_ut_smat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
-h2 helpcontent2\util\swriter nmake - all helpcontent2_ut_swri helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_smat helpcontent2_smat_00 hel
pcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sbasic nmake - all helpcontent2_ut_sbas helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\schart nmake - all helpcontent2_ut_scha helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\scalc nmake - all helpcontent2_ut_scal helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sdraw nmake - all helpcontent2_ut_sdra helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\sdatabase nmake - all helpcontent2_ut_sdat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\shared nmake - all helpcontent2_ut_shar helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\simpress nmake - all helpcontent2_ut_simp helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\smath nmake - all helpcontent2_ut_smat helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
+h2 helpcontent2\util\swriter nmake - all helpcontent2_ut_swri helpcontent2_aux helpcontent2_sbas_guid helpcontent2_sbas_shar helpcontent2_sbas_shar_01 helpcontent2_sbas_shar_02 helpcontent2_scal helpcontent2_scal_00 helpcontent2_scal_01 helpcontent2_scal_02 helpcontent2_scal_04 helpcontent2_scal_05 helpcontent2_scal_guid helpcontent2_scha helpcontent2_scha_00 helpcontent2_scha_01 helpcontent2_scha_02 helpcontent2_scha_04 helpcontent2_sdra helpcontent2_sdra_00 helpcontent2_sdra_01 helpcontent2_sdra_04 helpcontent2_sdra_guid helpcontent2_shar helpcontent2_shar_00 helpcontent2_shar_01 helpcontent2_shar_02 helpcontent2_shar_04 helpcontent2_shar_05 helpcontent2_shar_07 helpcontent2_shar_auko helpcontent2_shar_aupi helpcontent2_shar_expl_data helpcontent2_shar_guid helpcontent2_shar_opti helpcontent2_simp helpcontent2_simp_00 helpcontent2_simp_01 helpcontent2_simp_02 helpcontent2_simp_04 helpcontent2_simp_guid helpcontent2_simp_mini helpcontent2_smat h
elpcontent2_smat_00 helpcontent2_smat_01 helpcontent2_smat_02 helpcontent2_smat_04 helpcontent2_smat_guid helpcontent2_swri helpcontent2_swri_00 helpcontent2_swri_01 helpcontent2_swri_02 helpcontent2_swri_04 helpcontent2_swri_guid NULL
h2 helpcontent2\source\auxiliary nmake - all helpcontent2_aux NULL
Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp Tue Apr 23 09:51:15 2013
@@ -220,7 +220,7 @@
<paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
</tablecell>
<tablecell>
- <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>
+ <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -231,7 +231,7 @@
<paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2, StarOffice 9.2</paragraph>
</tablecell>
</tablerow>
</table>
Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/ref_pdf_export.xhp Tue Apr 23 09:51:15 2013
@@ -127,8 +127,8 @@
<paragraph xml-lang="en-US" id="hd_id3954548" role="heading" level="2" l10n="NEW">Embed standard fonts</paragraph>
<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
- <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Embed this document inside the PDF</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">The document being exported will be embedded inside the PDF file.</ahelp> Some PDF tools or %PRODUCTNAME extensions may allow to extract the file from the PDF and save it; in this way, the orignal %PRODUCTNAME document can be edited back without the need of a PDF editing application.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
<paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" l10n="NEW">Panes</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/01010500.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/01010500.xhp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/01010500.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/01010500.xhp Tue Apr 23 09:51:15 2013
@@ -79,10 +79,11 @@
<paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_ADD">Adds a new color.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY" id="bm_id3150324" localize="false"/>
<paragraph role="heading" id="hd_id3153708" xml-lang="en-US" level="2" l10n="U" oldref="29">Modify</paragraph>
-<paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color.</ahelp> Note that the color is overwritten without a confirmation.</paragraph>
+<paragraph role="paragraph" id="par_id3148916" xml-lang="en-US" l10n="C" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_MODIFY">Changes the current color. Note that the color is overwritten without a confirmation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2" l10n="U" oldref="31"><link href="text/shared/optionen/01010501.xhp" name="Edit">Edit</link></paragraph>
-<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
+<paragraph role="paragraph" id="par_id3141111" xml-lang="en-US" l10n="N"><ahelp hid=".">Opens the Color Picker. First highlight a color in the Color table. Then click Edit to open the Color Picker. Select a color in the Color Picker and click OK. The selected color replaces the color that is highlighted in the Color table.</ahelp></paragraph>
+
<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="33">Load Color List</paragraph>