This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ca41231d9e Maintenance cleanup
ca41231d9e is described below
commit ca41231d9e330adbb3cff54175670d80e843e360
Author: mseidel <[email protected]>
AuthorDate: Sun Oct 8 15:51:35 2023 +0200
Maintenance cleanup
---
main/dbaccess/source/ui/dlg/indexdialog.cxx | 52 +-
.../uielement/langselectionmenucontroller.cxx | 257 +++++----
main/sfx2/source/appl/newhelp.src | 138 ++---
main/sfx2/source/bastyp/progress.cxx | 265 ++++-----
main/store/source/storlckb.hxx | 23 +-
main/svx/source/mnuctrls/SmartTagCtl.cxx | 174 +++---
main/sw/source/core/view/vprint.cxx | 625 +++++++++++----------
main/tools/source/generic/poly2.cxx | 20 +-
main/vcl/inc/vcl/pdfextoutdevdata.hxx | 70 +--
main/vcl/inc/vcl/pdfwriter.hxx | 6 +-
main/writerfilter/inc/resourcemodel/TableData.hxx | 28 +-
.../inc/resourcemodel/TableManager.hxx | 4 +-
12 files changed, 832 insertions(+), 830 deletions(-)
diff --git a/main/dbaccess/source/ui/dlg/indexdialog.cxx
b/main/dbaccess/source/ui/dlg/indexdialog.cxx
index 3d4c4e774c..db31250768 100644
--- a/main/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/main/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -42,7 +42,7 @@
#ifndef _DBAUI_INDEXCOLLECTION_HXX_
#include "indexcollection.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
#endif
#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
@@ -95,7 +95,7 @@ namespace dbaui
return sal_False;
ConstIndexFieldsIterator aLeft = _rLHS.begin();
- ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
+ ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
ConstIndexFieldsIterator aRight = _rRHS.begin();
for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
{
@@ -135,9 +135,9 @@ namespace dbaui
::rtl::OUString sNewName(_rNewText);
::rtl::OUString sAlias =
::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
if ( (
xMeta->supportsMixedCaseQuotedIdentifiers() )
- ?
- sAlias != sNewName
- :
+ ?
+ sAlias != sNewName
+ :
!sNewName.equalsIgnoreAsciiCase(sAlias))
return sal_False;
}
@@ -199,8 +199,8 @@ namespace dbaui
//==================================================================
DBG_NAME(DbaIndexDialog)
//------------------------------------------------------------------
- DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
- const
Reference< XNameAccess >& _rxIndexes,
+ DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
+ const
Reference< XNameAccess >& _rxIndexes,
const
Reference< XConnection >& _rxConnection,
const
Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
@@ -221,7 +221,7 @@ DBG_NAME(DbaIndexDialog)
,m_bEditAgain(sal_False)
,m_xORB(_rxORB)
{
- DBG_CTOR(DbaIndexDialog,NULL);
+ DBG_CTOR(DbaIndexDialog,NULL);
FreeResource();
@@ -313,7 +313,7 @@ DBG_NAME(DbaIndexDialog)
SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
sal_Bool bSelectedAnything = NULL != pSelected;
-
+
if (pSelected)
{
@@ -321,14 +321,14 @@ DBG_NAME(DbaIndexDialog)
Indexes::const_iterator aSelectedPos =
m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData());
m_aActions.EnableItem(ID_INDEX_SAVE,
aSelectedPos->isModified() || aSelectedPos->isNew());
m_aActions.EnableItem(ID_INDEX_RESET,
aSelectedPos->isModified() || aSelectedPos->isNew());
- bSelectedAnything = bSelectedAnything &&
!aSelectedPos->bPrimaryKey;
+ bSelectedAnything = bSelectedAnything &&
!aSelectedPos->bPrimaryKey;
}
else
{
m_aActions.EnableItem(ID_INDEX_SAVE, sal_False);
m_aActions.EnableItem(ID_INDEX_RESET, sal_False);
}
- m_aActions.EnableItem(ID_INDEX_DROP, bSelectedAnything);
+ m_aActions.EnableItem(ID_INDEX_DROP, bSelectedAnything);
m_aActions.EnableItem(ID_INDEX_RENAME, bSelectedAnything);
}
@@ -365,9 +365,9 @@ DBG_NAME(DbaIndexDialog)
// save our geometry settings
// Point aPos = GetPosPixel();
// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y());
-
- DBG_DTOR(DbaIndexDialog,NULL);
- }
+
+ DBG_DTOR(DbaIndexDialog,NULL);
+ }
//------------------------------------------------------------------
sal_Bool DbaIndexDialog::implCommit(SvLBoxEntry* _pEntry)
@@ -571,7 +571,7 @@ DBG_NAME(DbaIndexDialog)
OnDropIndex(sal_False);
return;
}
-
+
SQLExceptionInfo aExceptionInfo;
try
{
@@ -638,7 +638,7 @@ DBG_NAME(DbaIndexDialog)
{
// the descriptor
Indexes::const_iterator aSelected = m_pIndexes->begin()
+ reinterpret_cast<sal_IntPtr>(pSelected->GetUserData());
-
+
if (aSelected->isModified() || aSelected->isNew())
{
QueryBox aQuestion(this,
ModuleRes(QUERY_SAVE_CURRENT_INDEX));
@@ -675,7 +675,7 @@ DBG_NAME(DbaIndexDialog)
IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry )
{
Indexes::iterator aPosition = m_pIndexes->begin() +
reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData());
-
+
DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition <
m_pIndexes->end(),
"DbaIndexDialog::OnEntryEdited: invalid entry!");
@@ -912,7 +912,7 @@ DBG_NAME(DbaIndexDialog)
{
sal_Int16 nN = IMG_INDEX_DLG_SC;
sal_Int16 nH = IMG_INDEX_DLG_SCH;
- if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
+ if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
{
nN = IMG_INDEX_DLG_LC;
nH = IMG_INDEX_DLG_LCH;
@@ -929,14 +929,14 @@ DBG_NAME(DbaIndexDialog)
Size aDlgSize = GetSizePixel();
// adjust size of dlg
SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(),
- aDlgSize.Height() +
_rDiff.Height())
+ aDlgSize.Height() +
_rDiff.Height())
);
Size aIndexSize = m_aIndexes.GetSizePixel();
m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() +
Point(0,_rDiff.Height()),
Size(aIndexSize.Width() + _rDiff.Width(),
-
aIndexSize.Height()));
+
aIndexSize.Height()));
- //now move the rest to the left side
+ // now move the rest to the left side
Point aMove(_rDiff.Width(),_rDiff.Height());
m_aIndexDetails.SetPosPixel(m_aIndexDetails.GetPosPixel() + aMove);
m_aDescriptionLabel.SetPosPixel(m_aDescriptionLabel.GetPosPixel() + aMove);
@@ -954,5 +954,5 @@ DBG_NAME(DbaIndexDialog)
//......................................................................
} // namespace dbaui
-//......................................................................
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/source/uielement/langselectionmenucontroller.cxx
b/main/framework/source/uielement/langselectionmenucontroller.cxx
index 949497c342..1258a2ee39 100644
--- a/main/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/main/framework/source/uielement/langselectionmenucontroller.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -104,7 +104,7 @@ DEFINE_INIT_SERVICE (
LanguageSelectionMenuController, {}
LanguageSelectionMenuController::LanguageSelectionMenuController( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
>& xServiceManager ) :
svt::PopupMenuControllerBase( xServiceManager ),
m_bShowMenu( sal_True ),
- m_aLangGuessHelper( xServiceManager )
+ m_aLangGuessHelper( xServiceManager )
{
}
@@ -115,66 +115,66 @@
LanguageSelectionMenuController::~LanguageSelectionMenuController()
// XEventListener
void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& )
throw ( RuntimeException )
{
- Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this,
UNO_QUERY );
+ Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this,
UNO_QUERY );
- osl::MutexGuard aLock( m_aMutex );
- m_xFrame.clear();
- m_xDispatch.clear();
- m_xLanguageDispatch.clear();
- m_xServiceManager.clear();
+ osl::MutexGuard aLock( m_aMutex );
+ m_xFrame.clear();
+ m_xDispatch.clear();
+ m_xLanguageDispatch.clear();
+ m_xServiceManager.clear();
- if ( m_xPopupMenu.is() )
- m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener
>(( OWeakObject *)this, UNO_QUERY ));
- m_xPopupMenu.clear();
+ if ( m_xPopupMenu.is() )
+ m_xPopupMenu->removeMenuListener( Reference<
css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
+ m_xPopupMenu.clear();
}
// XStatusListener
void SAL_CALL LanguageSelectionMenuController::statusChanged( const
FeatureStateEvent& Event ) throw ( RuntimeException )
{
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
- if (rBHelper.bDisposed || rBHelper.bInDispose)
- return;
+ if (rBHelper.bDisposed || rBHelper.bInDispose)
+ return;
m_bShowMenu = sal_True;
- m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;
//set the default value
-
- OUString aStrValue;
- Sequence< OUString > aSeq;
-
- if ( Event.State >>= aSeq )
- {
- if ( aSeq.getLength() == 4 )
- {
- // Retrieve all other values from the sequence and
- // store it members!
- m_aCurLang = aSeq[0];
- m_nScriptType = static_cast< sal_Int16 >(aSeq[1].toInt32());
- m_aKeyboardLang = aSeq[2];
- m_aGuessedTextLang = aSeq[3];
- }
- }
- else if ( !Event.State.hasValue() )
+ m_nScriptType = LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX;
// set the default value
+
+ OUString aStrValue;
+ Sequence< OUString > aSeq;
+
+ if ( Event.State >>= aSeq )
{
- m_bShowMenu = sal_False; // no language -> no sub-menu entries
-> disable menu
+ if ( aSeq.getLength() == 4 )
+ {
+ // Retrieve all other values from the sequence and
+ // store it members!
+ m_aCurLang = aSeq[0];
+ m_nScriptType = static_cast< sal_Int16
>(aSeq[1].toInt32());
+ m_aKeyboardLang = aSeq[2];
+ m_aGuessedTextLang = aSeq[3];
+ }
+ }
+ else if ( !Event.State.hasValue() )
+ {
+ m_bShowMenu = sal_False; // no language -> no sub-menu
entries -> disable menu
}
}
// XMenuListener
void LanguageSelectionMenuController::impl_select(const Reference< XDispatch
>& _xDispatch,const ::com::sun::star::util::URL& aTargetURL)
{
- Reference< XDispatch > xDispatch = _xDispatch;
+ Reference< XDispatch > xDispatch = _xDispatch;
if ( aTargetURL.Complete == m_aMenuCommandURL_Font )
- { //open format/character dialog for current selection
+ { // open format/character dialog for current selection
xDispatch = m_xMenuDispatch_Font;
}
else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang )
- { //open language tab-page in tools/options dialog
+ { // open language tab-page in tools/options dialog
xDispatch = m_xMenuDispatch_Lang;
}
else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph )
- { //open format/character dialog for current selection
+ { // open format/character dialog for current selection
xDispatch = m_xMenuDispatch_CharDlgForParagraph;
}
@@ -186,62 +186,62 @@ void LanguageSelectionMenuController::impl_select(const
Reference< XDispatch >&
}
if ( xDispatch.is() )
- {
- Sequence<PropertyValue> aArgs;
- if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
- UiEventLogHelper(
OUString::createFromAscii("LanguageSelectionMenuController")).log(
m_xServiceManager, m_xFrame, aTargetURL, aArgs );
- xDispatch->dispatch( aTargetURL, aArgs );
+ {
+ Sequence<PropertyValue> aArgs;
+ if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+ UiEventLogHelper(
OUString::createFromAscii("LanguageSelectionMenuController")).log(
m_xServiceManager, m_xFrame, aTargetURL, aArgs );
+ xDispatch->dispatch( aTargetURL, aArgs );
}
}
// XPopupMenuController
void LanguageSelectionMenuController::impl_setPopupMenu()
{
- Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+ Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- com::sun::star::util::URL aTargetURL;
+ com::sun::star::util::URL aTargetURL;
- // Register for language updates
- aTargetURL.Complete = m_aLangStatusCommandURL;
- m_xURLTransformer->parseStrict( aTargetURL );
- m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
+ // Register for language updates
+ aTargetURL.Complete = m_aLangStatusCommandURL;
+ m_xURLTransformer->parseStrict( aTargetURL );
+ m_xLanguageDispatch = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
// Register for setting languages and opening language dialog
- aTargetURL.Complete = m_aMenuCommandURL_Lang;
- m_xURLTransformer->parseStrict( aTargetURL );
- m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
+ aTargetURL.Complete = m_aMenuCommandURL_Lang;
+ m_xURLTransformer->parseStrict( aTargetURL );
+ m_xMenuDispatch_Lang = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
// Register for opening character dialog
- aTargetURL.Complete = m_aMenuCommandURL_Font;
- m_xURLTransformer->parseStrict( aTargetURL );
- m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
+ aTargetURL.Complete = m_aMenuCommandURL_Font;
+ m_xURLTransformer->parseStrict( aTargetURL );
+ m_xMenuDispatch_Font = xDispatchProvider->queryDispatch( aTargetURL,
OUString(), 0 );
// Register for opening character dialog with preselected paragraph
- aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
- m_xURLTransformer->parseStrict( aTargetURL );
- m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch(
aTargetURL, OUString(), 0 );
+ aTargetURL.Complete = m_aMenuCommandURL_CharDlgForParagraph;
+ m_xURLTransformer->parseStrict( aTargetURL );
+ m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch(
aTargetURL, OUString(), 0 );
}
void LanguageSelectionMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
{
- VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu
*)VCLXMenu::GetImplementation( rPopupMenu );
- PopupMenu* pPopupMenu = 0;
+ VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu
*)VCLXMenu::GetImplementation( rPopupMenu );
+ PopupMenu* pPopupMenu = 0;
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+ vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
- resetPopupMenu( rPopupMenu );
+ resetPopupMenu( rPopupMenu );
if (!m_bShowMenu)
return;
- if ( pVCLPopupMenu )
- pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu();
+ if ( pVCLPopupMenu )
+ pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu();
String aCmd;
String aCmd_Dialog;
String aCmd_Language;
- if( eMode == MODE_SetLanguageSelectionMenu )
+ if( eMode == MODE_SetLanguageSelectionMenu )
{
- aCmd_Dialog.AppendAscii(".uno:FontDialog?Language:string=*");
+ aCmd_Dialog.AppendAscii(".uno:FontDialog?Language:string=*");
aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Current_");
}
else if ( eMode == MODE_SetLanguageParagraphMenu )
@@ -249,69 +249,67 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference< css::awt::XPopup
aCmd_Dialog.AppendAscii(".uno:FontDialogForParagraph");
aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Paragraph_");
}
- else if ( eMode == MODE_SetLanguageAllTextMenu )
- {
- aCmd_Dialog.AppendAscii(".uno:LanguageStatus?Language:string=*");
-
aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Default_");
- }
-
- SvtLanguageTable aLanguageTable;
-
- // get languages to be displayed in the menu
- std::set< OUString > aLangItems;
- FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
- m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
-
- //
- // now add menu entries
- // the different menues purpose will be handled by the different string
- // for aCmd_Dialog and aCmd_Language
- //
-
- sal_Int16 nItemId = 1; // in this control the item id is not important
for executing the command
- const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); // multiple
languages in current selection
- const OUString sEmpty; // 'no language found' from language guessing
- std::map< sal_Int16, OUString > aLangMap;
- std::set< OUString >::const_iterator it;
- for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
+ else if ( eMode == MODE_SetLanguageAllTextMenu )
{
- const OUString & rStr( *it );
- if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
- rStr != sAsterix &&
- rStr != sEmpty)
+
aCmd_Dialog.AppendAscii(".uno:LanguageStatus?Language:string=*");
+
aCmd_Language.AppendAscii(".uno:LanguageStatus?Language:string=Default_");
+ }
+
+ SvtLanguageTable aLanguageTable;
+
+ // get languages to be displayed in the menu
+ std::set< OUString > aLangItems;
+ FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+ m_nScriptType, m_aCurLang, m_aKeyboardLang,
m_aGuessedTextLang );
+
+ // now add menu entries
+ // the different menu purposes will be handled by the different string
+ // for aCmd_Dialog and aCmd_Language
+
+ sal_Int16 nItemId = 1; // in this control the item id is not important
for executing the command
+ const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); // multiple
languages in current selection
+ const OUString sEmpty; // 'no language found' from language guessing
+ std::map< sal_Int16, OUString > aLangMap;
+ std::set< OUString >::const_iterator it;
+ for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
+ {
+ const OUString & rStr( *it );
+ if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE )
)&&
+ rStr != sAsterix &&
+ rStr != sEmpty)
{
pPopupMenu->InsertItem( nItemId, rStr );
aCmd = aCmd_Language;
aCmd += String( rStr );
pPopupMenu->SetItemCommand( nItemId, aCmd );
- if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
+ if (rStr == m_aCurLang && eMode ==
MODE_SetLanguageSelectionMenu )
{
//make a sign for the current language
pPopupMenu->CheckItem( nItemId, sal_True );
}
- aLangMap[ nItemId ] = rStr;
- ++nItemId;
+ aLangMap[ nItemId ] = rStr;
+ ++nItemId;
}
}
- // entry for LANGUAGE_NONE
+ // entry for LANGUAGE_NONE
++nItemId;
pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE
)) );
aCmd=aCmd_Language;
aCmd.AppendAscii("LANGUAGE_NONE");
pPopupMenu->SetItemCommand( nItemId, aCmd );
- // entry for 'Reset to default language'
+ // entry for 'Reset to default language'
++nItemId;
pPopupMenu->InsertItem( nItemId, String(FwlResId(
STR_RESET_TO_DEFAULT_LANGUAGE )) );
aCmd=aCmd_Language;
aCmd.AppendAscii("RESET_LANGUAGES");
pPopupMenu->SetItemCommand( nItemId, aCmd );
- // entry for opening the Format/Character dialog
+ // entry for opening the Format/Character dialog
++nItemId;
pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_MORE
)));
- pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
+ pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
}
@@ -319,55 +317,56 @@ void SAL_CALL
LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::
{
svt::PopupMenuControllerBase::updatePopupMenu();
- // Force status update to get information about the current languages
- osl::ClearableMutexGuard aLock( m_aMutex );
- Reference< XDispatch > xDispatch( m_xLanguageDispatch );
- com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = m_aLangStatusCommandURL;
- m_xURLTransformer->parseStrict( aTargetURL );
- aLock.clear();
+ // Force status update to get information about the current languages
+ osl::ClearableMutexGuard aLock( m_aMutex );
+ Reference< XDispatch > xDispatch( m_xLanguageDispatch );
+ com::sun::star::util::URL aTargetURL;
+ aTargetURL.Complete = m_aLangStatusCommandURL;
+ m_xURLTransformer->parseStrict( aTargetURL );
+ aLock.clear();
- if ( xDispatch.is() )
- {
- xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this
), aTargetURL );
- xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*,
this ), aTargetURL );
- }
+ if ( xDispatch.is() )
+ {
+ xDispatch->addStatusListener( SAL_STATIC_CAST(
XStatusListener*, this ), aTargetURL );
+ xDispatch->removeStatusListener( SAL_STATIC_CAST(
XStatusListener*, this ), aTargetURL );
+ }
- // TODO: Fill menu with the information retrieved by the status update
+ // TODO: Fill menu with the information retrieved by the status update
- if( m_aCommandURL.equalsAscii( ".uno:SetLanguageSelectionMenu" ))
+ if( m_aCommandURL.equalsAscii( ".uno:SetLanguageSelectionMenu" ))
{
- fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu );
+ fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu );
}
else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageParagraphMenu" ))
{
fillPopupMenu(m_xPopupMenu, MODE_SetLanguageParagraphMenu );
}
- else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageAllTextMenu" ))
+ else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageAllTextMenu" ))
{
- fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu );
+ fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu );
}
}
// XInitialization
void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any
>& aArguments ) throw ( Exception, RuntimeException )
{
- osl::MutexGuard aLock( m_aMutex );
+ osl::MutexGuard aLock( m_aMutex );
- sal_Bool bInitialized( m_bInitialized );
- if ( !bInitialized )
- {
+ sal_Bool bInitialized( m_bInitialized );
+ if ( !bInitialized )
+ {
svt::PopupMenuControllerBase::initialize(aArguments);
- if ( m_bInitialized )
- {
+ if ( m_bInitialized )
+ {
m_aLangStatusCommandURL =
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" ));
m_aMenuCommandURL_Lang =
m_aLangStatusCommandURL;
m_aMenuCommandURL_Font =
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" ));
m_aMenuCommandURL_CharDlgForParagraph = OUString(
RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" ));
- }
- }
+ }
+ }
}
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sfx2/source/appl/newhelp.src
b/main/sfx2/source/appl/newhelp.src
index 672bb15171..7fae89aaf2 100644
--- a/main/sfx2/source/appl/newhelp.src
+++ b/main/sfx2/source/appl/newhelp.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -29,47 +29,47 @@ Window WIN_HELPINDEX
{
Hide = TRUE ;
Size = MAP_APPFONT ( 120, 200 ) ;
- DialogControl = TRUE;
+ DialogControl = TRUE ;
ListBox LB_ACTIVE
{
- HelpId = HID_HELP_LISTBOX;
+ HelpId = HID_HELP_LISTBOX ;
Border = TRUE ;
- DropDown = TRUE;
+ DropDown = TRUE ;
Pos = MAP_APPFONT ( 3, 3 ) ;
Size = MAP_APPFONT ( 114, 40 ) ;
};
FixedLine FL_ACTIVE
{
- Hide = True;
+ Hide = TRUE ;
Pos = MAP_APPFONT ( 2, 19 ) ;
Size = MAP_APPFONT ( 118, 1 ) ;
};
TabControl TC_INDEX
{
- HelpId = HID_HELP_TABCONTROL;
+ HelpId = HID_HELP_TABCONTROL ;
Pos = MAP_APPFONT ( 3, 19 ) ;
- TabStop = TRUE;
+ TabStop = TRUE ;
PageList =
{
PageItem
{
Identifier = HELP_INDEX_PAGE_CONTENTS ;
- Text [ en-US ] = "Contents";
+ Text [ en-US ] = "Contents" ;
};
PageItem
{
Identifier = HELP_INDEX_PAGE_INDEX ;
- Text [ en-US ] = "Index";
+ Text [ en-US ] = "Index" ;
};
PageItem
{
Identifier = HELP_INDEX_PAGE_SEARCH ;
- Text [ en-US ] = "Find";
+ Text [ en-US ] = "Find" ;
};
PageItem
{
Identifier = HELP_INDEX_PAGE_BOOKMARKS ;
- Text [ en-US ] = "Bookmarks";
+ Text [ en-US ] = "Bookmarks" ;
};
};
};
@@ -77,9 +77,9 @@ Window WIN_HELPINDEX
TabPage TP_HELP_INDEX
{
- HelpId = HID_HELP_TABPAGE_INDEX;
+ HelpId = HID_HELP_TABPAGE_INDEX ;
Hide = TRUE ;
- DialogControl = TRUE;
+ DialogControl = TRUE ;
Size = MAP_APPFONT ( 120, 200 ) ;
FixedText FT_EXPRESSION
{
@@ -89,14 +89,14 @@ TabPage TP_HELP_INDEX
};
ComboBox CB_INDEX
{
- HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX";
+ HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX" ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6, 17 ) ;
Size = MAP_APPFONT ( 108, 97 ) ;
};
PushButton PB_OPEN_INDEX
{
- HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX";
+ HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX" ;
Pos = MAP_APPFONT ( 64, 115 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -105,9 +105,9 @@ TabPage TP_HELP_INDEX
TabPage TP_HELP_SEARCH
{
- HelpId = HID_HELP_TABPAGE_SEARCH;
+ HelpId = HID_HELP_TABPAGE_SEARCH ;
Hide = TRUE ;
- DialogControl = TRUE;
+ DialogControl = TRUE ;
Size = MAP_APPFONT ( 140, 122 ) ;
FixedText FT_SEARCH
{
@@ -117,43 +117,43 @@ TabPage TP_HELP_SEARCH
};
ComboBox ED_SEARCH
{
- HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH";
+ HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH" ;
Border = TRUE ;
- DropDown = TRUE;
+ DropDown = TRUE ;
Pos = MAP_APPFONT ( 6, 17 ) ;
Size = MAP_APPFONT ( 92, 40 ) ;
};
PushButton PB_SEARCH
{
- HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH";
+ HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH" ;
Pos = MAP_APPFONT ( 101, 17 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Find";
+ Text [ en-US ] = "~Find" ;
};
CheckBox CB_FULLWORDS
{
- HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS";
+ HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS" ;
Pos = MAP_APPFONT ( 6, 34 ) ;
Size = MAP_APPFONT ( 128, 10 ) ;
- Text [ en-US ] = "~Complete words only";
+ Text [ en-US ] = "~Complete words only" ;
};
CheckBox CB_SCOPE
{
- HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE";
+ HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE" ;
Pos = MAP_APPFONT ( 6, 47 ) ;
Size = MAP_APPFONT ( 128, 10 ) ;
- Text [ en-US ] = "Find in ~headings only";
+ Text [ en-US ] = "Find in ~headings only" ;
};
ListBox LB_RESULT
{
- HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT";
+ HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT" ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6, 60 ) ;
Size = MAP_APPFONT ( 128, 30 ) ;
};
PushButton PB_OPEN_SEARCH
{
- HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH";
+ HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH" ;
Pos = MAP_APPFONT ( 84, 182 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -162,9 +162,9 @@ TabPage TP_HELP_SEARCH
TabPage TP_HELP_BOOKMARKS
{
- HelpId = HID_HELP_TABPAGE_BOOKMARKS;
+ HelpId = HID_HELP_TABPAGE_BOOKMARKS ;
Hide = TRUE ;
- DialogControl = TRUE;
+ DialogControl = TRUE ;
Size = MAP_APPFONT ( 120, 200 ) ;
FixedText FT_BOOKMARKS
{
@@ -174,15 +174,15 @@ TabPage TP_HELP_BOOKMARKS
};
ListBox LB_BOOKMARKS
{
- HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS";
+ HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS" ;
Border = TRUE ;
- Sort = TRUE;
+ Sort = TRUE ;
Pos = MAP_APPFONT ( 6, 19 ) ;
Size = MAP_APPFONT ( 108, 97 ) ;
};
PushButton PB_BOOKMARKS
{
- HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS";
+ HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS" ;
Pos = MAP_APPFONT ( 64, 119 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -191,15 +191,15 @@ TabPage TP_HELP_BOOKMARKS
TabPage TP_HELP_CONTENT
{
- HelpId = HID_HELP_TABPAGE_CONTENTS;
+ HelpId = HID_HELP_TABPAGE_CONTENTS ;
Hide = TRUE ;
- DialogControl = TRUE;
+ DialogControl = TRUE ;
Size = MAP_APPFONT ( 120, 200 ) ;
Control LB_CONTENTS
{
HelpId = HID_HELP_TREELISTBOX_CONTENTS ;
Border = TRUE ;
- TabStop = TRUE;
+ TabStop = TRUE ;
Pos = MAP_APPFONT ( 6, 6 ) ;
Size = MAP_APPFONT ( 108, 188 ) ;
};
@@ -268,56 +268,56 @@ Image IMG_HELP_CONTENT_DOC_HC
String STR_HELP_WINDOW_TITLE
{
- Text [ en-US ] = "%PRODUCTNAME Help";
+ Text [ en-US ] = "%PRODUCTNAME Help" ;
};
String STR_HELP_BUTTON_INDEX_ON
{
- Text [ en-US ] = "Show Navigation Pane";
+ Text [ en-US ] = "Show Navigation Pane" ;
};
String STR_HELP_BUTTON_INDEX_OFF
{
- Text [ en-US ] = "Hide Navigation Pane";
+ Text [ en-US ] = "Hide Navigation Pane" ;
};
String STR_HELP_BUTTON_START
{
- Text [ en-US ] = "First Page";
+ Text [ en-US ] = "First Page" ;
};
String STR_HELP_BUTTON_PREV
{
- Text [ en-US ] = "Previous Page";
+ Text [ en-US ] = "Previous Page" ;
};
String STR_HELP_BUTTON_NEXT
{
- Text [ en-US ] = "Next Page";
+ Text [ en-US ] = "Next Page" ;
};
String STR_HELP_BUTTON_PRINT
{
- Text [ en-US ] = "Print...";
+ Text [ en-US ] = "Print..." ;
};
String STR_HELP_BUTTON_ADDBOOKMARK
{
- Text [ en-US ] = "Add to Bookmarks...";
+ Text [ en-US ] = "Add to Bookmarks..." ;
};
String STR_HELP_BUTTON_SEARCHDIALOG
{
- Text [ en-US ] = "Find on this Page...";
+ Text [ en-US ] = "Find on this Page..." ;
};
String STR_HELP_BUTTON_SOURCEVIEW
{
- Text [ en-US ] = "HTML Source";
+ Text [ en-US ] = "HTML Source" ;
};
String STR_HELP_FIRST_MESSAGE
{
- Text [ en-US ] = "The Help is being started...";
+ Text [ en-US ] = "The Help is being started..." ;
};
String STR_HELP_FIRST_HTML
{
- Text =
"<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>";
+ Text =
"<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>"
;
};
String STR_HELP_MENU_TEXT_SELECTION_MODE
{
- Text [ en-US ] = "Select Text";
+ Text [ en-US ] = "Select Text" ;
};
String STR_HELP_MENU_TEXT_COPY
{
@@ -325,9 +325,9 @@ String STR_HELP_MENU_TEXT_COPY
};
ModalDialog DLG_HELP_ADDBOOKMARK
{
- HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK";
+ HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK" ;
Size = MAP_APPFONT ( 208, 43 ) ;
- Text [ en-US ] = "Add to Bookmarks";
+ Text [ en-US ] = "Add to Bookmarks" ;
MOVEABLE = TRUE ;
CLOSEABLE = TRUE ;
OUTPUTSIZE = TRUE ;
@@ -342,7 +342,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
};
Edit ED_BOOKMARK_TITLE
{
- HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE";
+ HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE" ;
PosSize = MAP_APPFONT ( 6, 19, 140, 12 ) ;
TABSTOP = TRUE ;
BORDER = TRUE ;
@@ -367,11 +367,11 @@ ModalDialog DLG_HELP_ADDBOOKMARK
PosSize = MAP_APPFONT ( 152, 43, 50, 14 ) ;
TABSTOP = TRUE ;
GROUP = TRUE ;
- Hide = TRUE;
+ Hide = TRUE ;
};
String STR_BOOKMARK_RENAME
{
- Text [ en-US ] = "Rename Bookmark";
+ Text [ en-US ] = "Rename Bookmark" ;
};
};
@@ -382,8 +382,8 @@ Menu MENU_HELP_BOOKMARKS
MenuItem
{
Identifier = MID_OPEN ;
- HelpId = HID_HELP_BOOKMARKS_OPEN;
- Text [ en-US ] = "Display";
+ HelpId = HID_HELP_BOOKMARKS_OPEN ;
+ Text [ en-US ] = "Display" ;
};
MenuItem
{
@@ -392,14 +392,14 @@ Menu MENU_HELP_BOOKMARKS
MenuItem
{
Identifier = MID_RENAME ;
- HelpId = HID_HELP_BOOKMARKS_RENAME;
- Text [ en-US ] = "Rename...";
+ HelpId = HID_HELP_BOOKMARKS_RENAME ;
+ Text [ en-US ] = "Rename..." ;
};
MenuItem
{
Identifier = MID_DELETE ;
- HelpId = HID_HELP_BOOKMARKS_DELETE;
- Text [ en-US ] = "Delete";
+ HelpId = HID_HELP_BOOKMARKS_DELETE ;
+ Text [ en-US ] = "Delete" ;
};
};
};
@@ -408,14 +408,14 @@ InfoBox RID_INFO_NOSEARCHRESULTS
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "No topics found.";
+ Message [ en-US ] = "No topics found." ;
};
InfoBox RID_INFO_NOSEARCHTEXTFOUND
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The text you entered was not found.";
+ Message [ en-US ] = "The text you entered was not found." ;
};
Image IMG_HELP_TOOLBOX_HC_INDEX_ON
@@ -531,12 +531,14 @@ Image IMG_HELP_TOOLBOX_HCL_COPY
CheckBox RID_HELP_ONSTARTUP_BOX
{
- HelpId = HID_HELP_ONSTARTUP_BOX;
- Hide = TRUE;
- TabStop = TRUE;
+ HelpId = HID_HELP_ONSTARTUP_BOX ;
+ Hide = TRUE ;
+ TabStop = TRUE ;
Size = MAP_APPFONT ( 200, 10 ) ;
};
String RID_HELP_ONSTARTUP_TEXT
{
- Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
+ Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup" ;
};
+
+// ********************************************************************** EOF
diff --git a/main/sfx2/source/bastyp/progress.cxx
b/main/sfx2/source/bastyp/progress.cxx
index 3e171d624d..6dea6bd400 100644
--- a/main/sfx2/source/bastyp/progress.cxx
+++ b/main/sfx2/source/bastyp/progress.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -75,8 +75,8 @@ void AddNumber_Impl( String& aNumber, sal_uInt32 nArg )
struct SfxProgress_Impl
{
- Reference < XStatusIndicator > xStatusInd;
- String aText, aStateText;
+ Reference < XStatusIndicator > xStatusInd;
+ String aText, aStateText;
sal_uIntPtr nMax;
clock_t nCreate;
clock_t nNextReschedule;
@@ -84,15 +84,15 @@ struct SfxProgress_Impl
sal_Bool bWaitMode;
sal_Bool bAllowRescheduling;
sal_Bool bRunning;
- sal_Bool bIsStatusText;
+ sal_Bool bIsStatusText;
- SfxProgress* pActiveProgress;
+ SfxProgress* pActiveProgress;
SfxObjectShellRef xObjSh;
SfxWorkWindow* pWorkWin;
- SfxViewFrame* pView;
+ SfxViewFrame* pView;
SfxProgress_Impl( const
String& );
- void Enable_Impl( sal_Bool );
+ void Enable_Impl( sal_Bool );
};
@@ -116,29 +116,29 @@ extern sal_uIntPtr Get10ThSec();
void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
{
- SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
+ SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
while ( pFrame )
{
pFrame->Enable(bEnable);
- pFrame->GetDispatcher()->Lock( !bEnable );
+ pFrame->GetDispatcher()->Lock( !bEnable );
pFrame = SfxViewFrame::GetNext(*pFrame, pDoc);
}
- if ( pView )
- {
- pView->Enable( bEnable );
- pView->GetDispatcher()->Lock( !bEnable );
- }
+ if ( pView )
+ {
+ pView->Enable( bEnable );
+ pView->GetDispatcher()->Lock( !bEnable );
+ }
if ( !pDoc )
- SFX_APP()->GetAppDispatcher_Impl()->Lock( !bEnable );
+ SFX_APP()->GetAppDispatcher_Impl()->Lock( !bEnable );
}
// -----------------------------------------------------------------------
SfxProgress_Impl::SfxProgress_Impl( const String &/*rTitle*/ )
- : pActiveProgress( 0 )
+ : pActiveProgress( 0 )
{
}
@@ -146,7 +146,7 @@ SfxProgress_Impl::SfxProgress_Impl( const String
&/*rTitle*/ )
SfxProgress::SfxProgress
(
- SfxObjectShell* pObjSh, /* SfxObjectShell, an der die Aktion ausgef"uhrt
+ SfxObjectShell* pObjSh, /* SfxObjectShell, an der die Aktion ausgeführt
wird. Kann NULL
sein, dann wird die Applikation
verwendet */
@@ -163,10 +163,10 @@ SfxProgress::SfxProgress
/* [Beschreibung]
Der Konstruktor der Klasse SfxProgress schaltet den als Parameter
- "ubergebenen SfxObjectShell und SfxViewFrames, welche dieses Dokument
+ übergebenen SfxObjectShell und SfxViewFrames, welche dieses Dokument
anzeigen in einen Progress-Mode. D.h. solange eine dieser SfxViewFrame
- Instanzen aktiv ist, ist der dazugeh"orige SfxDispatcher und das
- dazugeh"orige Window disabled. In der Statuszeile wird ein Balken zur
+ Instanzen aktiv ist, ist der dazugehörige SfxDispatcher und das
+ dazugehörige Window disabled. In der Statuszeile wird ein Balken zur
Fortschritts-Anzeige angezeigt.
*/
@@ -189,13 +189,13 @@ SfxProgress::SfxProgress
rText.GetBuffer(), pImp->nCreate ) );
pImp->bAllDocs = bAll;
pImp->pWorkWin = 0;
- pImp->pView = 0;
+ pImp->pView = 0;
pImp->pActiveProgress = GetActiveProgress( pObjSh );
if ( pObjSh )
pObjSh->SetProgress_Impl(this);
else if( !pImp->pActiveProgress )
- SFX_APP()->SetProgress_Impl(this);
+ SFX_APP()->SetProgress_Impl(this);
Resume();
}
@@ -212,8 +212,8 @@ SfxProgress::~SfxProgress()
{
Stop();
- if ( pImp->xStatusInd.is() )
- pImp->xStatusInd->end();
+ if ( pImp->xStatusInd.is() )
+ pImp->xStatusInd->end();
if( pImp->bIsStatusText == sal_True )
GetpApp()->HideStatusText( );
@@ -230,12 +230,12 @@ void SfxProgress::Stop()
*/
{
- if( pImp->pActiveProgress )
- {
- if ( pImp->xObjSh.Is() && pImp->xObjSh->GetProgress() == this )
- pImp->xObjSh->SetProgress_Impl(0);
- return;
- }
+ if( pImp->pActiveProgress )
+ {
+ if ( pImp->xObjSh.Is() && pImp->xObjSh->GetProgress() == this )
+ pImp->xObjSh->SetProgress_Impl(0);
+ return;
+ }
if ( !pImp->bRunning )
return;
@@ -246,9 +246,9 @@ void SfxProgress::Stop()
if ( pImp->xObjSh.Is() )
pImp->xObjSh->SetProgress_Impl(0);
else
- SFX_APP()->SetProgress_Impl(0);
+ SFX_APP()->SetProgress_Impl(0);
if ( pImp->bLocked )
- pImp->Enable_Impl(sal_True);
+ pImp->Enable_Impl(sal_True);
}
// -----------------------------------------------------------------------
@@ -260,17 +260,17 @@ void SfxProgress::SetText
/* [Beschreibung]
- "Andert den Text, der links neben dem Fortschritts-Balken
+ Ändert den Text, der links neben dem Fortschritts-Balken
angezeigt wird.
*/
{
if( pImp->pActiveProgress ) return;
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->reset();
- pImp->xStatusInd->start( pImp->aText, pImp->nMax );
- }
+ if ( pImp->xStatusInd.is() )
+ {
+ pImp->xStatusInd->reset();
+ pImp->xStatusInd->start( pImp->aText, pImp->nMax );
+ }
}
// -----------------------------------------------------------------------
@@ -308,7 +308,7 @@ static sal_uIntPtr nLastTime = 0;
long TimeOut_Impl( void*, void* pArgV )
{
- Timer *pArg = (Timer*)pArgV;
+ Timer *pArg = (Timer*)pArgV;
if( Time::GetSystemTicks() - nLastTime > 3000 )
{
GetpApp()->HideStatusText();
@@ -323,9 +323,9 @@ long TimeOut_Impl( void*, void* pArgV )
sal_Bool SfxProgress::SetStateText
(
- sal_uLong nNewVal, /* neuer Wert f"ur die
Fortschritts-Anzeige */
+ sal_uLong nNewVal, /* neuer Wert für die
Fortschritts-Anzeige */
const String& rNewVal, /* Status als Text */
- sal_uLong nNewRange /* neuer Maximalwert, 0
f"ur Beibehaltung des alten */
+ sal_uLong nNewRange /* neuer Maximalwert, 0
für Beibehaltung des alten */
)
{
@@ -337,9 +337,9 @@ sal_Bool SfxProgress::SetStateText
sal_Bool SfxProgress::SetState
(
- sal_uLong nNewVal, /* neuer Wert f"ur die
Fortschritts-Anzeige */
+ sal_uLong nNewVal, /* neuer Wert für die
Fortschritts-Anzeige */
- sal_uLong nNewRange /* neuer Maximalwert, 0 f"ur
Beibehaltung des alten */
+ sal_uLong nNewRange /* neuer Maximalwert, 0 für
Beibehaltung des alten */
)
/* [Beschreibung]
@@ -347,7 +347,7 @@ sal_Bool SfxProgress::SetState
wird Reschedule aufgerufen.
- [R"uckgabewert]
+ [Rückgabewert]
sal_Bool TRUE
Fortfahren mit der Aktion
@@ -363,7 +363,7 @@ sal_Bool SfxProgress::SetState
if( pImp->pActiveProgress ) return sal_True;
- // neuen Wert "ubernehmen
+ // neuen Wert übernehmen
sal_Bool bOver=sal_False;
nVal = nNewVal;
@@ -376,61 +376,61 @@ sal_Bool SfxProgress::SetState
bOver = sal_True;
}
- if ( !pImp->xStatusInd.is() )
+ if ( !pImp->xStatusInd.is() )
{
- // get the active ViewFrame of the document this progress is working on
- // if it doesn't work on a document, take the current ViewFrame
- SfxObjectShell* pObjSh = pImp->xObjSh;
- pImp->pView = SfxViewFrame::Current();
- DBG_ASSERT( pImp->pView || pObjSh, "Can't make progress bar!");
- if ( pObjSh && ( !pImp->pView || pObjSh !=
pImp->pView->GetObjectShell() ) )
- {
- // current document does not belong to current ViewFrame; take
it's first visible ViewFrame
- SfxViewFrame* pDocView = SfxViewFrame::GetFirst( pObjSh );
- if ( pDocView )
- pImp->pView = pDocView;
- else
- {
- // don't show status indicator for hidden documents (only
valid while loading)
- SfxMedium* pMedium = pObjSh->GetMedium();
- SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem,
SfxBoolItem, SID_HIDDEN, sal_False );
- if ( !pHiddenItem || !pHiddenItem->GetValue() )
- {
- // not in a view, perhaps it's just loading
- //SfxFrame* pFrame = pMedium->GetLoadTargetFrame();
- //if ( pFrame && pFrame->GetCurrentViewFrame() )
- //{
- // recycling frame
- //pImp->pView = pFrame->GetCurrentViewFrame();
- //}
- //else
- {
- SFX_ITEMSET_ARG( pMedium->GetItemSet(),
pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
- Reference< XStatusIndicator > xInd;
- if ( pIndicatorItem &&
(pIndicatorItem->GetValue()>>=xInd) )
- pImp->xStatusInd = xInd;
- }
- }
- }
- }
- else if ( pImp->pView )
- {
- pImp->pWorkWin = SFX_APP()->GetWorkWindow_Impl( pImp->pView );
- if ( pImp->pWorkWin )
- pImp->xStatusInd = pImp->pWorkWin->GetStatusIndicator();
- }
-
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->start( pImp->aText, pImp->nMax );
- pImp->pView = NULL;
- }
+ // get the active ViewFrame of the document this progress is
working on
+ // if it doesn't work on a document, take the current ViewFrame
+ SfxObjectShell* pObjSh = pImp->xObjSh;
+ pImp->pView = SfxViewFrame::Current();
+ DBG_ASSERT( pImp->pView || pObjSh, "Can't make progress bar!");
+ if ( pObjSh && ( !pImp->pView || pObjSh !=
pImp->pView->GetObjectShell() ) )
+ {
+ // current document does not belong to current
ViewFrame; take its first visible ViewFrame
+ SfxViewFrame* pDocView = SfxViewFrame::GetFirst( pObjSh
);
+ if ( pDocView )
+ pImp->pView = pDocView;
+ else
+ {
+ // don't show status indicator for hidden
documents (only valid while loading)
+ SfxMedium* pMedium = pObjSh->GetMedium();
+ SFX_ITEMSET_ARG( pMedium->GetItemSet(),
pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
+ if ( !pHiddenItem || !pHiddenItem->GetValue() )
+ {
+ // not in a view, perhaps it's just
loading
+ //SfxFrame* pFrame =
pMedium->GetLoadTargetFrame();
+ //if ( pFrame &&
pFrame->GetCurrentViewFrame() )
+ //{
+ // recycling frame
+ //pImp->pView =
pFrame->GetCurrentViewFrame();
+ //}
+ //else
+ {
+ SFX_ITEMSET_ARG(
pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem,
SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
+ Reference< XStatusIndicator >
xInd;
+ if ( pIndicatorItem &&
(pIndicatorItem->GetValue()>>=xInd) )
+ pImp->xStatusInd = xInd;
+ }
+ }
+ }
+ }
+ else if ( pImp->pView )
+ {
+ pImp->pWorkWin = SFX_APP()->GetWorkWindow_Impl(
pImp->pView );
+ if ( pImp->pWorkWin )
+ pImp->xStatusInd =
pImp->pWorkWin->GetStatusIndicator();
+ }
+
+ if ( pImp->xStatusInd.is() )
+ {
+ pImp->xStatusInd->start( pImp->aText, pImp->nMax );
+ pImp->pView = NULL;
+ }
}
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->setValue( nNewVal );
- }
+ if ( pImp->xStatusInd.is() )
+ {
+ pImp->xStatusInd->setValue( nNewVal );
+ }
return sal_True;
}
@@ -452,11 +452,11 @@ void SfxProgress::Resume()
if ( bSuspended )
{
DBG( DbgOutf( "SfxProgress: resumed" ) );
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->start( pImp->aText, pImp->nMax );
- pImp->xStatusInd->setValue( nVal );
- }
+ if ( pImp->xStatusInd.is() )
+ {
+ pImp->xStatusInd->start( pImp->aText, pImp->nMax );
+ pImp->xStatusInd->setValue( nVal );
+ }
if ( pImp->bWaitMode )
{
@@ -471,9 +471,9 @@ void SfxProgress::Resume()
if ( pImp->xObjSh )
{
- SfxViewFrame *pFrame = SfxViewFrame::GetFirst(pImp->xObjSh);
- if ( pFrame )
- pFrame->GetBindings().ENTERREGISTRATIONS();
+ SfxViewFrame *pFrame =
SfxViewFrame::GetFirst(pImp->xObjSh);
+ if ( pFrame )
+ pFrame->GetBindings().ENTERREGISTRATIONS();
}
bSuspended = sal_False;
@@ -499,10 +499,10 @@ void SfxProgress::Suspend()
DBG( DbgOutf( "SfxProgress: suspended" ) );
bSuspended = sal_True;
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->reset();
- }
+ if ( pImp->xStatusInd.is() )
+ {
+ pImp->xStatusInd->reset();
+ }
if ( pImp->xObjSh.Is() && !pImp->bAllDocs )
{
@@ -515,8 +515,8 @@ void SfxProgress::Suspend()
if ( pImp->xObjSh.Is() )
{
SfxViewFrame *pFrame =
SfxViewFrame::GetFirst(pImp->xObjSh);
- if ( pFrame )
- pFrame->GetBindings().LEAVEREGISTRATIONS();
+ if ( pFrame )
+ pFrame->GetBindings().LEAVEREGISTRATIONS();
}
}
}
@@ -554,7 +554,7 @@ void SfxProgress::Lock()
}
}
- pImp->Enable_Impl( sal_False );
+ pImp->Enable_Impl( sal_False );
DBG( DbgOutf( "SfxProgress: locked" ) );
pImp->bLocked = sal_True;
@@ -570,7 +570,7 @@ void SfxProgress::UnLock()
DBG( DbgOutf( "SfxProgress: unlocked" ) );
pImp->bLocked = sal_False;
- pImp->Enable_Impl(sal_True);
+ pImp->Enable_Impl(sal_True);
}
// -----------------------------------------------------------------------
@@ -579,7 +579,7 @@ void SfxProgress::Reschedule()
/* [Beschreibung]
- Reschedule von au"sen rufbar
+ Reschedule von außen rufbar
*/
@@ -587,13 +587,13 @@ void SfxProgress::Reschedule()
SFX_STACK(SfxProgress::Reschedule);
if( pImp->pActiveProgress ) return;
- SfxApplication* pApp = SFX_APP();
- if ( pImp->bLocked && 0 == pApp->Get_Impl()->nRescheduleLocks )
+ SfxApplication* pApp = SFX_APP();
+ if ( pImp->bLocked && 0 == pApp->Get_Impl()->nRescheduleLocks )
{
- DBG_ASSERTWARNING( pApp->IsInAsynchronCall_Impl(),
+ DBG_ASSERTWARNING( pApp->IsInAsynchronCall_Impl(),
"Reschedule in
synchron-call-stack" );
- SfxAppData_Impl *pAppData = pApp->Get_Impl();
+ SfxAppData_Impl *pAppData = pApp->Get_Impl();
++pAppData->nInReschedule;
Application::Reschedule();
--pAppData->nInReschedule;
@@ -668,16 +668,16 @@ SfxProgress* SfxProgress::GetActiveProgress
(
SfxObjectShell* pDocSh /* <SfxObjectShell>, die nach einem laufenden
<SfxProgress> gefragt werden soll, oder
- 0, wenn
ein f"ur die gesamte Applikation
+ 0, wenn
ein für die gesamte Applikation
laufender SfxProgress erfragt werden soll.
Der
Pointer braucht nur zum Zeitpunkt des
- Aufrufs
g"ultig zu sein. */
+ Aufrufs
gültig zu sein. */
)
/* [Beschreibung]
Mit dieser Methode kann erfragt werden, ob und welcher <SfxProgress>-
- f"ur eine bestimmte Instanz von SfxObjectShell oder gar die gesamte
+ für eine bestimmte Instanz von SfxObjectShell oder gar die gesamte
Applikation zur Zeit aktiv ist. Dies kann z.B. zum Abfangen von
Time-Out-Events etc. verwendet werden.
@@ -690,9 +690,9 @@ SfxProgress* SfxProgress::GetActiveProgress
[Anmerkung]
- "auft kein SfxProgress an der Applikation und ebenfalls keiner an
- der angegebenen SfxObjectShell, dann wird immer 0 zur"uckgeliefert,
- auch wenn an einer anderen SfxObjectShell ein SfxProgress l"uft.
+ Läuft kein SfxProgress an der Applikation und ebenfalls keiner an
+ der angegebenen SfxObjectShell, dann wird immer 0 zurückgeliefert,
+ auch wenn an einer anderen SfxObjectShell ein SfxProgress läuft.
[Querverweise]
@@ -702,8 +702,8 @@ SfxProgress* SfxProgress::GetActiveProgress
*/
{
- if ( !SfxApplication::Get() )
- return 0;
+ if ( !SfxApplication::Get() )
+ return 0;
SfxProgress *pProgress = 0;
if ( pDocSh )
@@ -733,13 +733,13 @@ void SfxProgress::LeaveLock()
FASTBOOL SfxProgress::StatusBarManagerGone_Impl
(
- SfxStatusBarManager * // dieser <SfxStatusBarManager> wird
zerst"ort
+ SfxStatusBarManager * // dieser <SfxStatusBarManager> wird
zerstört
)
/* [Beschreibung]
- Interne Methode zum Benachrichtigen des SfxProgress, da\s der angegebene
- SfxStatusBarManger zerst"ort wird. Damit der Progress ihn loslassen
+ Interne Methode zum Benachrichtigen des SfxProgress, dass der angegebene
+ SfxStatusBarManger zerstört wird. Damit der Progress ihn loslassen
kann.
*/
@@ -747,3 +747,4 @@ FASTBOOL SfxProgress::StatusBarManagerGone_Impl
return sal_True;
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/store/source/storlckb.hxx b/main/store/source/storlckb.hxx
index 74597f31cc..d5d80a9db2 100644
--- a/main/store/source/storlckb.hxx
+++ b/main/store/source/storlckb.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -40,9 +40,7 @@ struct OStoreDataPageData;
struct OStoreDirectoryPageData;
/*========================================================================
- *
* OStoreLockBytes interface.
- *
*======================================================================*/
class OStoreLockBytes : public store::OStoreObject
{
@@ -102,7 +100,7 @@ public:
storeError setSize (sal_uInt32 nSize);
/** stat.
- * @paran rnSize [out]
+ * @param rnSize [out]
* @return store_E_None upon success
*/
storeError stat (sal_uInt32 &rnSize);
@@ -133,8 +131,8 @@ private:
typedef OStoreDataPageData data;
typedef OStoreDirectoryPageData inode;
- typedef PageHolderObject< inode > inode_holder_type;
- inode_holder_type m_xNode;
+ typedef PageHolderObject< inode > inode_holder_type;
+ inode_holder_type m_xNode;
bool m_bWriteable;
@@ -155,13 +153,8 @@ SAL_CALL query (IStoreHandle *pHandle, OStoreLockBytes*)
return 0;
}
-/*========================================================================
- *
- * The End.
- *
- *======================================================================*/
-
} // namespace store
#endif /* !_STORE_STORLCKB_HXX_ */
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/mnuctrls/SmartTagCtl.cxx
b/main/svx/source/mnuctrls/SmartTagCtl.cxx
index 2873a87e37..6e467a0aee 100644
--- a/main/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/main/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -57,7 +57,7 @@ SvxSmartTagsControl::SvxSmartTagsControl
) :
mpMenu ( new PopupMenu ),
mrParent ( rMenu ),
- mpSmartTagItem( 0 )
+ mpSmartTagItem( 0 )
{
rMenu.SetPopupMenu( _nId, mpMenu );
}
@@ -68,67 +68,67 @@ const sal_uInt16 MN_ST_INSERT_START = 500;
void SvxSmartTagsControl::FillMenu()
{
- if ( !mpSmartTagItem )
- return;
-
- sal_uInt16 nMenuPos = 0;
- sal_uInt16 nSubMenuPos = 0;
- sal_uInt16 nMenuId = 1;
- sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
-
- const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >&
rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
- const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence =
mpSmartTagItem->GetActionIndicesSequence();
- const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps =
mpSmartTagItem->GetStringKeyMaps();
- const lang::Locale& rLocale = mpSmartTagItem->GetLocale();
- const rtl::OUString aApplicationName =
mpSmartTagItem->GetApplicationName();
- const rtl::OUString aRangeText = mpSmartTagItem->GetRangeText();
- const Reference<text::XTextRange>& xTextRange =
mpSmartTagItem->GetTextRange();
- const Reference<frame::XController>& xController =
mpSmartTagItem->GetController();
-
- for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
- {
- Reference< container::XStringKeyMap > xSmartTagProperties =
rStringKeyMaps[j];
-
- // Get all actions references associated with the current smart tag
type:
- const Sequence< Reference< smarttags::XSmartTagAction > >&
rActionComponents = rActionComponentsSequence[j];
- const Sequence< sal_Int32 >& rActionIndices =
rActionIndicesSequence[j];
-
- if ( 0 == rActionComponents.getLength() || 0 ==
rActionIndices.getLength() )
- continue;
-
- // Ask first entry for the smart tag type caption:
- Reference< smarttags::XSmartTagAction > xAction = rActionComponents[0];
-
- if ( !xAction.is() )
- continue;
-
- const sal_Int32 nSmartTagIndex = rActionIndices[0];
- const rtl::OUString aSmartTagType = xAction->getSmartTagName(
nSmartTagIndex );
- const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption(
nSmartTagIndex, rLocale);
-
- // no sub-menues if there's only one smart tag type listed:
- PopupMenu* pSbMenu = mpMenu;
- if ( 1 < rActionComponentsSequence.getLength() )
- {
- mpMenu->InsertItem( nMenuId, aSmartTagCaption, 0, nMenuPos++);
- pSbMenu = new PopupMenu;
- mpMenu->SetPopupMenu( nMenuId++, pSbMenu );
- }
- pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
-
- // sub-menu starts with smart tag caption and separator
- const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + C2U(": ") +
aRangeText;
- nSubMenuPos = 0;
- pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2, MIB_NOSELECT,
nSubMenuPos++ );
- pSbMenu->InsertSeparator( nSubMenuPos++ );
-
- // Add subitem for every action reference for the current smart tag
type:
- for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
- {
- xAction = rActionComponents[i];
-
- for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType,
xController, xSmartTagProperties ); ++k )
- {
+ if ( !mpSmartTagItem )
+ return;
+
+ sal_uInt16 nMenuPos = 0;
+ sal_uInt16 nSubMenuPos = 0;
+ sal_uInt16 nMenuId = 1;
+ sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
+
+ const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >&
rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
+ const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence =
mpSmartTagItem->GetActionIndicesSequence();
+ const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps
= mpSmartTagItem->GetStringKeyMaps();
+ const lang::Locale& rLocale = mpSmartTagItem->GetLocale();
+ const rtl::OUString aApplicationName =
mpSmartTagItem->GetApplicationName();
+ const rtl::OUString aRangeText = mpSmartTagItem->GetRangeText();
+ const Reference<text::XTextRange>& xTextRange =
mpSmartTagItem->GetTextRange();
+ const Reference<frame::XController>& xController =
mpSmartTagItem->GetController();
+
+ for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
+ {
+ Reference< container::XStringKeyMap > xSmartTagProperties =
rStringKeyMaps[j];
+
+ // Get all actions references associated with the current smart
tag type:
+ const Sequence< Reference< smarttags::XSmartTagAction > >&
rActionComponents = rActionComponentsSequence[j];
+ const Sequence< sal_Int32 >& rActionIndices =
rActionIndicesSequence[j];
+
+ if ( 0 == rActionComponents.getLength() || 0 ==
rActionIndices.getLength() )
+ continue;
+
+ // Ask first entry for the smart tag type caption:
+ Reference< smarttags::XSmartTagAction > xAction =
rActionComponents[0];
+
+ if ( !xAction.is() )
+ continue;
+
+ const sal_Int32 nSmartTagIndex = rActionIndices[0];
+ const rtl::OUString aSmartTagType = xAction->getSmartTagName(
nSmartTagIndex );
+ const rtl::OUString aSmartTagCaption =
xAction->getSmartTagCaption( nSmartTagIndex, rLocale);
+
+ // no sub-menus if there's only one smart tag type listed:
+ PopupMenu* pSbMenu = mpMenu;
+ if ( 1 < rActionComponentsSequence.getLength() )
+ {
+ mpMenu->InsertItem( nMenuId, aSmartTagCaption, 0,
nMenuPos++);
+ pSbMenu = new PopupMenu;
+ mpMenu->SetPopupMenu( nMenuId++, pSbMenu );
+ }
+ pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl,
MenuSelect ) );
+
+ // sub-menu starts with smart tag caption and separator
+ const rtl::OUString aSmartTagCaption2 = aSmartTagCaption +
C2U(": ") + aRangeText;
+ nSubMenuPos = 0;
+ pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2,
MIB_NOSELECT, nSubMenuPos++ );
+ pSbMenu->InsertSeparator( nSubMenuPos++ );
+
+ // Add subitem for every action reference for the current smart
tag type:
+ for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
+ {
+ xAction = rActionComponents[i];
+
+ for ( sal_Int32 k = 0; k < xAction->getActionCount(
aSmartTagType, xController, xSmartTagProperties ); ++k )
+ {
const sal_uInt32 nActionID = xAction->getActionID(
aSmartTagType, k, xController );
rtl::OUString aActionCaption =
xAction->getActionCaptionFromID( nActionID,
aApplicationName,
@@ -157,12 +157,12 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16,
SfxItemState eState, const S
if ( SFX_ITEM_AVAILABLE == eState )
{
const SvxSmartTagItem* pSmartTagItem = PTR_CAST(
SvxSmartTagItem, pState );
- if ( 0 != pSmartTagItem )
- {
+ if ( 0 != pSmartTagItem )
+ {
delete mpSmartTagItem;
mpSmartTagItem = new SvxSmartTagItem( *pSmartTagItem );
FillMenu();
- }
+ }
}
}
@@ -170,21 +170,21 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16,
SfxItemState eState, const S
IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
{
- if ( !mpSmartTagItem )
- return 0;
+ if ( !mpSmartTagItem )
+ return 0;
- sal_uInt16 nMyId = pMen->GetCurItemId();
+ sal_uInt16 nMyId = pMen->GetCurItemId();
- if ( nMyId < MN_ST_INSERT_START) return 0;
- nMyId -= MN_ST_INSERT_START;
+ if ( nMyId < MN_ST_INSERT_START) return 0;
+ nMyId -= MN_ST_INSERT_START;
- // compute smarttag lib index and action index
- Reference< smarttags::XSmartTagAction > xSmartTagAction = maInvokeActions[
nMyId ].mxAction;
+ // compute smarttag lib index and action index
+ Reference< smarttags::XSmartTagAction > xSmartTagAction =
maInvokeActions[ nMyId ].mxAction;
- // execute action
- if ( xSmartTagAction.is() )
- {
- xSmartTagAction->invokeAction( maInvokeActions[ nMyId ].mnActionID,
+ // execute action
+ if ( xSmartTagAction.is() )
+ {
+ xSmartTagAction->invokeAction( maInvokeActions[ nMyId
].mnActionID,
mpSmartTagItem->GetApplicationName(),
mpSmartTagItem->GetController(),
mpSmartTagItem->GetTextRange(),
@@ -192,14 +192,14 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect,
PopupMenu *, pMen )
mpSmartTagItem->GetRangeText(),
rtl::OUString(),
mpSmartTagItem->GetLocale() );
- }
+ }
- // ohne dispatcher!!!
+ // ohne dispatcher!!!
// GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden
items, 0L );*/
- //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
- //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG,
SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
+ //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
+ //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG,
SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
- return 0;
+ return 0;
}
IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
@@ -207,7 +207,7 @@ IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect,
PopupMenu *, pMen )
SvxSmartTagsControl::~SvxSmartTagsControl()
{
- delete mpSmartTagItem;
+ delete mpSmartTagItem;
delete mpMenu;
}
@@ -218,4 +218,4 @@ PopupMenu* SvxSmartTagsControl::GetPopup() const
return mpMenu;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/view/vprint.cxx
b/main/sw/source/core/view/vprint.cxx
index 5179d3f882..1a7c5f5229 100644
--- a/main/sw/source/core/view/vprint.cxx
+++ b/main/sw/source/core/view/vprint.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -60,19 +60,19 @@
#include <wdocsh.hxx>
#include <fesh.hxx>
#include <pam.hxx>
-#include <viewimp.hxx> // Imp->SetFirstVisPageInvalid()
+#include <viewimp.hxx> // Imp->SetFirstVisPageInvalid()
#include <layact.hxx>
#include <ndtxt.hxx>
#include <fldbas.hxx>
-#include <docfld.hxx> // _SetGetExpFld
-#include <docufld.hxx> // PostItFld /-Type
+#include <docfld.hxx> // _SetGetExpFld
+#include <docufld.hxx> // PostItFld /-Type
#include <shellres.hxx>
#include <viewopt.hxx>
-#include <printdata.hxx> // SwPrintData
+#include <printdata.hxx> // SwPrintData
#include <pagedesc.hxx>
-#include <poolfmt.hxx> // fuer RES_POOLPAGE_JAKET
-#include <mdiexp.hxx> // Ansteuern der Statusleiste
-#include <statstr.hrc> // -- " --
+#include <poolfmt.hxx> // for RES_POOLPAGE_JAKET
+#include <mdiexp.hxx> // Ansteuern der Statusleiste
+#include <statstr.hrc> // -- " --
#include <ptqueue.hxx>
#include <tabfrm.hxx>
#include <txtfrm.hxx> // MinPrtLine
@@ -104,12 +104,12 @@ SwQueuedPaint *SwPaintQueue::pQueue = 0;
// saves some settings from the draw view
class SwDrawViewSave
{
- String sLayerNm;
- SdrView* pDV;
- sal_Bool bPrintControls;
+ String sLayerNm;
+ SdrView* pDV;
+ sal_Bool bPrintControls;
public:
- SwDrawViewSave( SdrView* pSdrView );
- ~SwDrawViewSave();
+ SwDrawViewSave( SdrView* pSdrView );
+ ~SwDrawViewSave();
};
@@ -147,8 +147,8 @@ void SwPaintQueue::Repaint()
{
if ( pSh->GetWin() )
{
- //Fuer PreView aussenherum, weil im
PaintHdl (UI) die
- //Zeilen/Spalten bekannt sind.
+ // Für PreView aussenherum, weil im
PaintHdl (UI) die
+ // Zeilen/Spalten bekannt sind.
pSh->GetWin()->Invalidate();
pSh->GetWin()->Update();
}
@@ -199,44 +199,44 @@ void SetSwVisArea( ViewShell *pSh, const SwRect &rRect
/*, sal_Bool bPDFExport*/
pSh->Imp()->SetFirstVisPageInvalid();
Point aPt( rRect.Pos() );
- // calculate an offset for the rectangle of the n-th page to
- // move the start point of the output operation to a position
- // such that in the output device all pages will be painted
- // at the same position
+ // calculate an offset for the rectangle of the n-th page to
+ // move the start point of the output operation to a position
+ // such that in the output device all pages will be painted
+ // at the same position
aPt.X() = -aPt.X(); aPt.Y() = -aPt.Y();
- OutputDevice *pOut = pSh->GetOut();
+ OutputDevice *pOut = pSh->GetOut();
- MapMode aMapMode( pOut->GetMapMode() );
+ MapMode aMapMode( pOut->GetMapMode() );
aMapMode.SetOrigin( aPt );
- pOut->SetMapMode( aMapMode );
+ pOut->SetMapMode( aMapMode );
}
/******************************************************************************/
void ViewShell::InitPrt( OutputDevice *pOutDev )
{
- //Fuer den Printer merken wir uns einen negativen Offset, der
- //genau dem Offset de OutputSize entspricht. Das ist notwendig,
- //weil unser Ursprung der linken ober Ecke der physikalischen
- //Seite ist, die Ausgaben (SV) aber den Outputoffset als Urstprung
- //betrachten.
- if ( pOutDev )
+ // Für den Printer merken wir uns einen negativen Offset, der
+ // genau dem Offset der OutputSize entspricht. Das ist notwendig,
+ // weil unser Ursprung die linke obere Ecke der physikalischen
+ // Seite ist, die Ausgaben (SV) aber den Outputoffset als Ursprung
+ // betrachten.
+ if ( pOutDev )
{
- aPrtOffst = Point();
+ aPrtOffst = Point();
- aPrtOffst += pOutDev->GetMapMode().GetOrigin();
- MapMode aMapMode( pOutDev->GetMapMode() );
+ aPrtOffst += pOutDev->GetMapMode().GetOrigin();
+ MapMode aMapMode( pOutDev->GetMapMode() );
aMapMode.SetMapUnit( MAP_TWIP );
- pOutDev->SetMapMode( aMapMode );
- pOutDev->SetLineColor();
- pOutDev->SetFillColor();
+ pOutDev->SetMapMode( aMapMode );
+ pOutDev->SetLineColor();
+ pOutDev->SetFillColor();
}
else
aPrtOffst.X() = aPrtOffst.Y() = 0;
if ( !pWin )
- pOut = pOutDev; //Oder was sonst?
+ pOut = pOutDev; //Oder was sonst?
}
/******************************************************************************
@@ -257,15 +257,15 @@ void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri )
for( sal_uInt16 i = 0; i < nAll; ++ i )
{
const SwPageDesc& rOld =
- const_cast<const SwDoc *>(GetDoc())->GetPageDesc( i );
+ const_cast<const SwDoc *>(GetDoc())->GetPageDesc( i );
if( rOld.GetLandscape() != bNewOri )
{
SwPageDesc aNew( rOld );
- {
- ::sw::UndoGuard const ug(GetDoc()->GetIDocumentUndoRedo());
- GetDoc()->CopyPageDesc(rOld, aNew);
- }
+ {
+ ::sw::UndoGuard const
ug(GetDoc()->GetIDocumentUndoRedo());
+ GetDoc()->CopyPageDesc(rOld, aNew);
+ }
aNew.SetLandscape( bNewOri );
SwFrmFmt& rFmt = aNew.GetMaster();
SwFmtFrmSize aSz( rFmt.GetFrmSize() );
@@ -279,7 +279,7 @@ void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri )
SwTwips aTmp = aSz.GetHeight();
aSz.SetHeight( aSz.GetWidth() );
aSz.SetWidth( aTmp );
- rFmt.SetFmtAttr( aSz );
+ rFmt.SetFmtAttr( aSz );
}
GetDoc()->ChgPageDesc( i, aNew );
}
@@ -298,17 +298,17 @@ void ViewShell::ChgAllPageSize( Size &rSz )
ASSERT( nStartAction, "missing an Action" );
SET_CURR_SHELL( this );
- SwDoc* pMyDoc = GetDoc();
- sal_uInt16 nAll = pMyDoc->GetPageDescCnt();
+ SwDoc* pMyDoc = GetDoc();
+ sal_uInt16 nAll = pMyDoc->GetPageDescCnt();
for( sal_uInt16 i = 0; i < nAll; ++i )
{
- const SwPageDesc &rOld = const_cast<const SwDoc
*>(pMyDoc)->GetPageDesc( i );
- SwPageDesc aNew( rOld );
- {
- ::sw::UndoGuard const ug(GetDoc()->GetIDocumentUndoRedo());
- GetDoc()->CopyPageDesc( rOld, aNew );
- }
+ const SwPageDesc &rOld = const_cast<const SwDoc
*>(pMyDoc)->GetPageDesc( i );
+ SwPageDesc aNew( rOld );
+ {
+ ::sw::UndoGuard const
ug(GetDoc()->GetIDocumentUndoRedo());
+ GetDoc()->CopyPageDesc( rOld, aNew );
+ }
SwFrmFmt& rPgFmt = aNew.GetMaster();
Size aSz( rSz );
const sal_Bool bOri = aNew.GetLandscape();
@@ -322,8 +322,8 @@ void ViewShell::ChgAllPageSize( Size &rSz )
SwFmtFrmSize aFrmSz( rPgFmt.GetFrmSize() );
aFrmSz.SetSize( aSz );
- rPgFmt.SetFmtAttr( aFrmSz );
- pMyDoc->ChgPageDesc( i, aNew );
+ rPgFmt.SetFmtAttr( aFrmSz );
+ pMyDoc->ChgPageDesc( i, aNew );
}
}
@@ -340,7 +340,7 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax )
pMyLayout->StartAllAction();
for ( sal_uInt16 i = 1; pPage && i <= nMax; pPage = pPage->GetNext(),
++i )
{
- pPage->Calc();
+ pPage->Calc();
SwRect aOldVis( VisArea() );
aVisArea = pPage->Frm();
Imp()->SetFirstVisPageInvalid();
@@ -351,9 +351,9 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax )
aAction.Action();
- aVisArea = aOldVis; //Zuruecksetzen wg. der
Paints!
+ aVisArea = aOldVis; //Zuruecksetzen wg. der Paints!
Imp()->SetFirstVisPageInvalid();
-// SwPaintQueue::Repaint();
+// SwPaintQueue::Repaint();
}
pMyLayout->EndAllAction();
@@ -363,226 +363,226 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax )
SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
{
- ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
- SwFEShell* pFESh = (SwFEShell*)this;
- // Wir bauen uns ein neues Dokument
-// SwDoc *pPrtDoc = new SwDoc;
-// pPrtDoc->acquire();
-// pPrtDoc->SetRefForDocShell( (SvEmbeddedObjectRef*)&(long&)rDocShellRef );
- pPrtDoc->LockExpFlds();
-
- // Der Drucker wird uebernommen
- //! Make a copy of it since it gets destroyed with the temporary document
- //! used for PDF export
- if (pPrt)
- pPrtDoc->setPrinter( new SfxPrinter(*pPrt), true, true );
-
- const SfxPoolItem* pCpyItem;
- const SfxItemPool& rPool = GetAttrPool();
- for( sal_uInt16 nWh = POOLATTR_BEGIN; nWh < POOLATTR_END; ++nWh )
- if( 0 != ( pCpyItem = rPool.GetPoolDefaultItem( nWh ) ) )
- pPrtDoc->GetAttrPool().SetPoolDefaultItem( *pCpyItem );
-
- // JP 29.07.99 - Bug 67951 - set all Styles from the SourceDoc into
- // the PrintDoc - will be replaced!
- pPrtDoc->ReplaceStyles( *GetDoc() );
-
- SwShellCrsr *pActCrsr = pFESh->_GetCrsr();
- SwShellCrsr *pFirstCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetNext());
- if( !pActCrsr->HasMark() ) // bei Multiselektion kann der aktuelle Cursor
leer sein
- {
- pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
- }
-
- // Die Y-Position der ersten Selektion
- // Die Y-Position der ersten Selektion
- Point aSelPoint;
- if( pFESh->IsTableMode() )
- {
- SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
-
- const SwCntntNode* pCntntNode =
pShellTblCrsr->GetNode()->GetCntntNode();
- const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->getLayoutFrm(
GetLayout(), 0, pShellTblCrsr->Start() ) : 0;
- if( pCntntFrm )
- {
- SwRect aCharRect;
- SwCrsrMoveState aTmpState( MV_NONE );
- pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(),
&aTmpState );
- aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
- }
- }
- else
- {
- aSelPoint = pFirstCrsr->GetSttPos();
- }
-
- const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
- ASSERT( pPage, "no page found!" );
-
- // get page descriptor - fall back to the first one if pPage could not be
found
- const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
- pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc(
(sal_uInt16)0 );
-
- if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
- { // Am letzten Absatz die Absatzattribute richten:
- SwNodeIndex aNodeIdx(
*pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
- SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx
)->GetTxtNode();
- SwCntntNode *pLastNd =
- pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <=
(*pActCrsr->GetPoint()) );
- // Hier werden die Absatzattribute des ersten Absatzes uebertragen
- if( pLastNd && pLastNd->IsTxtNode() )
- ((SwTxtNode*)pLastNd)->CopyCollFmt( *pTxtNd );
- }
-
- // es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
-//REMOVE // if( aDocShellRef.Is() )
-//REMOVE // SwDataExchange::InitOle( aDocShellRef, pPrtDoc );
- // und fuellen es mit dem selektierten Bereich
- pFESh->Copy( pPrtDoc );
-
- //Jetzt noch am ersten Absatz die Seitenvorlage setzen
- {
- SwNodeIndex aNodeIdx(
*pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
- SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); // gehe
zum 1. ContentNode
- if( pFESh->IsTableMode() )
- {
- SwTableNode* pTNd = pCNd->FindTableNode();
- if( pTNd )
- pTNd->GetTable().GetFrmFmt()->SetFmtAttr( SwFmtPageDesc(
pPageDesc ) );
- }
- else
- {
- pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
- if( pFirstCrsr->HasMark() )
- {
- SwTxtNode *pTxtNd = pCNd->GetTxtNode();
- if( pTxtNd )
- {
- SwCntntNode *pFirstNd =
- pFirstCrsr->GetCntntNode( (*pFirstCrsr->GetMark()) >
(*pFirstCrsr->GetPoint()) );
- // Hier werden die Absatzattribute des ersten Absatzes
uebertragen
- if( pFirstNd && pFirstNd->IsTxtNode() )
- ((SwTxtNode*)pFirstNd)->CopyCollFmt( *pTxtNd );
- }
- }
- }
- }
- return pPrtDoc;
+ ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
+ SwFEShell* pFESh = (SwFEShell*)this;
+ // Wir bauen uns ein neues Dokument
+// SwDoc *pPrtDoc = new SwDoc;
+// pPrtDoc->acquire();
+// pPrtDoc->SetRefForDocShell( (SvEmbeddedObjectRef*)&(long&)rDocShellRef
);
+ pPrtDoc->LockExpFlds();
+
+ // Der Drucker wird uebernommen
+ //! Make a copy of it since it gets destroyed with the temporary
document
+ //! used for PDF export
+ if (pPrt)
+ pPrtDoc->setPrinter( new SfxPrinter(*pPrt), true, true );
+
+ const SfxPoolItem* pCpyItem;
+ const SfxItemPool& rPool = GetAttrPool();
+ for( sal_uInt16 nWh = POOLATTR_BEGIN; nWh < POOLATTR_END; ++nWh )
+ if( 0 != ( pCpyItem = rPool.GetPoolDefaultItem( nWh ) ) )
+ pPrtDoc->GetAttrPool().SetPoolDefaultItem( *pCpyItem );
+
+ // JP 29.07.99 - Bug 67951 - set all Styles from the SourceDoc into
+ // the PrintDoc - will be replaced!
+ pPrtDoc->ReplaceStyles( *GetDoc() );
+
+ SwShellCrsr *pActCrsr = pFESh->_GetCrsr();
+ SwShellCrsr *pFirstCrsr =
dynamic_cast<SwShellCrsr*>(pActCrsr->GetNext());
+ if( !pActCrsr->HasMark() ) // bei Multiselektion kann der aktuelle
Cursor leer sein
+ {
+ pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
+ }
+
+ // Die Y-Position der ersten Selektion
+ // Die Y-Position der ersten Selektion
+ Point aSelPoint;
+ if( pFESh->IsTableMode() )
+ {
+ SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
+
+ const SwCntntNode* pCntntNode =
pShellTblCrsr->GetNode()->GetCntntNode();
+ const SwCntntFrm *pCntntFrm = pCntntNode ?
pCntntNode->getLayoutFrm( GetLayout(), 0, pShellTblCrsr->Start() ) : 0;
+ if( pCntntFrm )
+ {
+ SwRect aCharRect;
+ SwCrsrMoveState aTmpState( MV_NONE );
+ pCntntFrm->GetCharRect( aCharRect,
*pShellTblCrsr->Start(), &aTmpState );
+ aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
+ }
+ }
+ else
+ {
+ aSelPoint = pFirstCrsr->GetSttPos();
+ }
+
+ const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
+ ASSERT( pPage, "no page found!" );
+
+ // get page descriptor - fall back to the first one if pPage could not
be found
+ const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
+ pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc(
(sal_uInt16)0 );
+
+ if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
+ { // Am letzten Absatz die Absatzattribute richten:
+ SwNodeIndex aNodeIdx(
*pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
+ SwTxtNode* pTxtNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx
)->GetTxtNode();
+ SwCntntNode *pLastNd =
+ pActCrsr->GetCntntNode( (*pActCrsr->GetMark()) <=
(*pActCrsr->GetPoint()) );
+ // Hier werden die Absatzattribute des ersten Absatzes
uebertragen
+ if( pLastNd && pLastNd->IsTxtNode() )
+ ((SwTxtNode*)pLastNd)->CopyCollFmt( *pTxtNd );
+ }
+
+ // es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
+//REMOVE // if( aDocShellRef.Is() )
+//REMOVE // SwDataExchange::InitOle( aDocShellRef,
pPrtDoc );
+ // und fuellen es mit dem selektierten Bereich
+ pFESh->Copy( pPrtDoc );
+
+ //Jetzt noch am ersten Absatz die Seitenvorlage setzen
+ {
+ SwNodeIndex aNodeIdx(
*pPrtDoc->GetNodes().GetEndOfContent().StartOfSectionNode() );
+ SwCntntNode* pCNd = pPrtDoc->GetNodes().GoNext( &aNodeIdx ); //
gehe zum 1. ContentNode
+ if( pFESh->IsTableMode() )
+ {
+ SwTableNode* pTNd = pCNd->FindTableNode();
+ if( pTNd )
+ pTNd->GetTable().GetFrmFmt()->SetFmtAttr(
SwFmtPageDesc( pPageDesc ) );
+ }
+ else
+ {
+ pCNd->SetAttr( SwFmtPageDesc( pPageDesc ) );
+ if( pFirstCrsr->HasMark() )
+ {
+ SwTxtNode *pTxtNd = pCNd->GetTxtNode();
+ if( pTxtNd )
+ {
+ SwCntntNode *pFirstNd =
+ pFirstCrsr->GetCntntNode(
(*pFirstCrsr->GetMark()) > (*pFirstCrsr->GetPoint()) );
+ // Hier werden die Absatzattribute des
ersten Absatzes uebertragen
+ if( pFirstNd && pFirstNd->IsTxtNode() )
+
((SwTxtNode*)pFirstNd)->CopyCollFmt( *pTxtNd );
+ }
+ }
+ }
+ }
+ return pPrtDoc;
}
-sal_Bool ViewShell::PrintOrPDFExport(
- OutputDevice *pOutDev,
- SwPrintData const& rPrintData,
- sal_Int32 nRenderer /* the index in the vector of pages to be printed
*/ )
+sal_Bool ViewShell::PrintOrPDFExport(
+ OutputDevice *pOutDev,
+ SwPrintData const& rPrintData,
+ sal_Int32 nRenderer /* the index in the vector of pages to be printed
*/ )
{
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//Immer die Druckroutinen in viewpg.cxx (PrintProspect) mitpflegen!!
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- const sal_Int32 nMaxRenderer =
rPrintData.GetRenderData().GetPagesToPrint().size() - 1;
+ const sal_Int32 nMaxRenderer =
rPrintData.GetRenderData().GetPagesToPrint().size() - 1;
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out of
bounds");
+ DBG_ASSERT( 0 <= nRenderer && nRenderer <= nMaxRenderer, "nRenderer out
of bounds");
#endif
- if (!pOutDev || nMaxRenderer < 0 || nRenderer < 0 || nRenderer >
nMaxRenderer)
- return sal_False;
+ if (!pOutDev || nMaxRenderer < 0 || nRenderer < 0 || nRenderer >
nMaxRenderer)
+ return sal_False;
- // save settings of OutputDevice (should be done always since the
- // output device is now provided by a call from outside the Writer)
- pOutDev->Push();
+ // save settings of OutputDevice (should be done always since the
+ // output device is now provided by a call from outside the Writer)
+ pOutDev->Push();
// eine neue Shell fuer den Printer erzeugen
ViewShell *pShell;
- SwDoc *pOutDevDoc;
-
- // Print/PDF export for (multi-)selection has already generated a
- // temporary document with the selected text.
- // (see XRenderable implementation in unotxdoc.cxx)
- // It is implemented this way because PDF export calls this Prt function
- // once per page and we do not like to always have the temporary document
- // to be created that often here.
- pOutDevDoc = GetDoc();
- pShell = new ViewShell( *this, 0, pOutDev );
-
- SdrView *pDrawView = pShell->GetDrawView();
- if (pDrawView)
- {
- pDrawView->SetBufferedOutputAllowed( false );
- pDrawView->SetBufferedOverlayAllowed( false );
- }
+ SwDoc *pOutDevDoc;
+
+ // Print/PDF export for (multi-)selection has already generated a
+ // temporary document with the selected text.
+ // (see XRenderable implementation in unotxdoc.cxx)
+ // It is implemented this way because PDF export calls this Prt function
+ // once per page and we do not like to always have the temporary
document
+ // to be created that often here.
+ pOutDevDoc = GetDoc();
+ pShell = new ViewShell( *this, 0, pOutDev );
+
+ SdrView *pDrawView = pShell->GetDrawView();
+ if (pDrawView)
+ {
+ pDrawView->SetBufferedOutputAllowed( false );
+ pDrawView->SetBufferedOverlayAllowed( false );
+ }
{ //Zusaetzlicher Scope, damit die CurrShell vor dem zerstoeren
der
//Shell zurueckgesetzt wird.
- SET_CURR_SHELL( pShell );
+ SET_CURR_SHELL( pShell );
- //JP 01.02.99: das ReadOnly Flag wird NIE mitkopiert; Bug 61335
- if( pOpt->IsReadonly() )
- pShell->pOpt->SetReadonly( sal_True );
+ //JP 01.02.99: das ReadOnly Flag wird NIE mitkopiert; Bug 61335
+ if( pOpt->IsReadonly() )
+ pShell->pOpt->SetReadonly( sal_True );
- // save options at draw view:
- SwDrawViewSave aDrawViewSave( pShell->GetDrawView() );
+ // save options at draw view:
+ SwDrawViewSave aDrawViewSave( pShell->GetDrawView() );
- pShell->PrepareForPrint( rPrintData );
+ pShell->PrepareForPrint( rPrintData );
- const sal_Int32 nPage = rPrintData.GetRenderData().GetPagesToPrint()[
nRenderer ];
+ const sal_Int32 nPage =
rPrintData.GetRenderData().GetPagesToPrint()[ nRenderer ];
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT( nPage == 0 ||
rPrintData.GetRenderData().GetValidPagesSet().count( nPage ) == 1, "nPage not
valid" );
+ DBG_ASSERT( nPage == 0 ||
rPrintData.GetRenderData().GetValidPagesSet().count( nPage ) == 1, "nPage not
valid" );
#endif
- const SwPageFrm *pStPage = 0;
- if (nPage > 0) // a 'regular' page, not one from the post-it document
- {
- const SwRenderData::ValidStartFramesMap_t &rFrms =
rPrintData.GetRenderData().GetValidStartFrames();
- SwRenderData::ValidStartFramesMap_t::const_iterator aIt(
rFrms.find( nPage ) );
- DBG_ASSERT( aIt != rFrms.end(), "failed to find start frame" );
- if (aIt == rFrms.end())
- return sal_False;
- pStPage = aIt->second;
- }
- else // a page from the post-its document ...
- {
- DBG_ASSERT( nPage == 0, "unexpected page number. 0 for post-it
pages expected" );
- pStPage = rPrintData.GetRenderData().GetPostItStartFrames()[
nRenderer ];
- }
- DBG_ASSERT( pStPage, "failed to get start page" );
-
- //!! applying view options and formatting the dcoument should now only
be done in getRendererCount!
-
- ViewShell *pViewSh2 = nPage == 0 ? /* post-it page? */
- rPrintData.GetRenderData().m_pPostItShell : pShell;
- ::SetSwVisArea( pViewSh2, pStPage->Frm() );
+ const SwPageFrm *pStPage = 0;
+ if (nPage > 0) // a 'regular' page, not one from the post-it
document
+ {
+ const SwRenderData::ValidStartFramesMap_t &rFrms =
rPrintData.GetRenderData().GetValidStartFrames();
+ SwRenderData::ValidStartFramesMap_t::const_iterator
aIt( rFrms.find( nPage ) );
+ DBG_ASSERT( aIt != rFrms.end(), "failed to find start
frame" );
+ if (aIt == rFrms.end())
+ return sal_False;
+ pStPage = aIt->second;
+ }
+ else // a page from the post-its document ...
+ {
+ DBG_ASSERT( nPage == 0, "unexpected page number. 0 for
post-it pages expected" );
+ pStPage =
rPrintData.GetRenderData().GetPostItStartFrames()[ nRenderer ];
+ }
+ DBG_ASSERT( pStPage, "failed to get start page" );
+
+ //!! applying view options and formatting the document should
now only be done in getRendererCount!
+
+ ViewShell *pViewSh2 = nPage == 0 ? /* post-it page? */
+ rPrintData.GetRenderData().m_pPostItShell :
pShell;
+ ::SetSwVisArea( pViewSh2, pStPage->Frm() );
// FIXME disabled because rPrintData.aOffset is always (0,0)
#if 0
- // wenn wir einen Umschlag drucken wird ein Offset beachtet
- if( pStPage->GetFmt()->GetPoolFmtId() == RES_POOLPAGE_JAKET )
- {
- Point aNewOrigin = pOutDev->GetMapMode().GetOrigin();
- aNewOrigin += rPrintData.aOffset;
- MapMode aTmp( pOutDev->GetMapMode() );
- aTmp.SetOrigin( aNewOrigin );
- pOutDev->SetMapMode( aTmp );
- }
+ // wenn wir einen Umschlag drucken wird ein Offset beachtet
+ if( pStPage->GetFmt()->GetPoolFmtId() == RES_POOLPAGE_JAKET )
+ {
+ Point aNewOrigin = pOutDev->GetMapMode().GetOrigin();
+ aNewOrigin += rPrintData.aOffset;
+ MapMode aTmp( pOutDev->GetMapMode() );
+ aTmp.SetOrigin( aNewOrigin );
+ pOutDev->SetMapMode( aTmp );
+ }
#endif
- pShell->InitPrt( pOutDev );
+ pShell->InitPrt( pOutDev );
+
+ pViewSh2 = nPage == 0 ? /* post-it page? */
+ rPrintData.GetRenderData().m_pPostItShell :
pShell;
+ ::SetSwVisArea( pViewSh2, pStPage->Frm() );
+
+ pStPage->GetUpper()->Paint( pStPage->Frm(), &rPrintData );
- pViewSh2 = nPage == 0 ? /* post-it page? */
- rPrintData.GetRenderData().m_pPostItShell : pShell;
- ::SetSwVisArea( pViewSh2, pStPage->Frm() );
-
- pStPage->GetUpper()->Paint( pStPage->Frm(), &rPrintData );
-
- SwPaintQueue::Repaint();
- } //Zus. Scope wg. CurShell!
+ SwPaintQueue::Repaint();
+ } // Zus. Scope wg. CurShell!
delete pShell;
- // restore settings of OutputDevice (should be done always now since the
- // output device is now provided by a call from outside the Writer)
- pOutDev->Pop();
+ // restore settings of OutputDevice (should be done always now since the
+ // output device is now provided by a call from outside the Writer)
+ pOutDev->Pop();
- return sal_True;
+ return sal_True;
}
/******************************************************************************
@@ -597,9 +597,9 @@ sal_Bool ViewShell::PrintOrPDFExport(
void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const
SwPrintData& rOptions,
OutputDevice* pOleOut, const
Rectangle& rRect )
{
- //Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon
- //eine, dann legen wir uns eine neue Sicht an, oder das Doc hat noch
- //keine, dann erzeugen wir die erste Sicht.
+ // Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon
+ // eine, dann legen wir uns eine neue Sicht an, oder das Doc hat noch
+ // keine, dann erzeugen wir die erste Sicht.
ViewShell *pSh;
if( pDoc->GetCurrentViewShell() )
pSh = new ViewShell( *pDoc->GetCurrentViewShell(), 0,
pOleOut,VSHELLFLAG_SHARELAYOUT );//swmod 080129
@@ -608,28 +608,28 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption
*pOpt, const SwPrintDat
{
SET_CURR_SHELL( pSh );
- pSh->PrepareForPrint( rOptions );
- pSh->SetPrtFormatOption( sal_True );
+ pSh->PrepareForPrint( rOptions );
+ pSh->SetPrtFormatOption( sal_True );
SwRect aSwRect( rRect );
pSh->aVisArea = aSwRect;
- if ( pSh->GetViewOptions()->getBrowseMode() &&
- pSh->GetNext() == pSh )
+ if ( pSh->GetViewOptions()->getBrowseMode() &&
+ pSh->GetNext() == pSh )
{
pSh->CheckBrowseView( sal_False );
pSh->GetLayout()->Lower()->InvalidateSize();
}
- // --> FME 2005-02-10 #119474#
- // CalcPagesForPrint() should not be necessary here. The pages in the
- // visible area will be formatted in SwRootFrm::Paint().
- // Removing this gives us a performance gain during saving the
- // document because the thumbnail creation will not trigger a complete
- // formatting of the document.
+ // --> FME 2005-02-10 #119474#
+ // CalcPagesForPrint() should not be necessary here. The pages
in the
+ // visible area will be formatted in SwRootFrm::Paint().
+ // Removing this gives us a performance gain during saving the
+ // document because the thumbnail creation will not trigger a
complete
+ // formatting of the document.
// Seiten fuers Drucken formatieren
- // pSh->CalcPagesForPrint( SHRT_MAX );
- // <--
+ // pSh->CalcPagesForPrint( SHRT_MAX );
+ // <--
//#39275# jetzt will der Meyer doch ein Clipping
pOleOut->Push( PUSH_CLIPREGION );
@@ -638,7 +638,7 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption
*pOpt, const SwPrintDat
// SFX_APP()->SpoilDemoOutput( *pOleOut, rRect );
pOleOut->Pop();
- // erst muss das CurrShell Object zerstoert werden!!
+ // erst muss das CurrShell Object zerstört werden!!
}
delete pSh;
}
@@ -654,62 +654,62 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption
*pOpt, const SwPrintDat
sal_Bool ViewShell::IsAnyFieldInDoc() const
{
- const SfxPoolItem* pItem;
- sal_uInt32 nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_FIELD
);
- for( sal_uInt32 n = 0; n < nMaxItems; ++n )
- {
- if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_FIELD, n )))
- {
- const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
- const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
- {
- return sal_True;
- }
- }
- }
-
- nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INPUTFIELD );
- for( sal_uInt32 n = 0; n < nMaxItems; ++n )
- {
- if( 0 != (pItem = pDoc->GetAttrPool().GetItem2( RES_TXTATR_INPUTFIELD,
n )))
- {
- const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
- const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
- if( pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
- {
- return sal_True;
- }
- }
- }
-
- return sal_False;
+ const SfxPoolItem* pItem;
+ sal_uInt32 nMaxItems = pDoc->GetAttrPool().GetItemCount2(
RES_TXTATR_FIELD );
+ for( sal_uInt32 n = 0; n < nMaxItems; ++n )
+ {
+ if( 0 != (pItem = pDoc->GetAttrPool().GetItem2(
RES_TXTATR_FIELD, n )))
+ {
+ const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
+ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+ if( pTxtFld &&
pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+ {
+ return sal_True;
+ }
+ }
+ }
+
+ nMaxItems = pDoc->GetAttrPool().GetItemCount2( RES_TXTATR_INPUTFIELD );
+ for( sal_uInt32 n = 0; n < nMaxItems; ++n )
+ {
+ if( 0 != (pItem = pDoc->GetAttrPool().GetItem2(
RES_TXTATR_INPUTFIELD, n )))
+ {
+ const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
+ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
+ if( pTxtFld &&
pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+ {
+ return sal_True;
+ }
+ }
+ }
+
+ return sal_False;
}
/******************************************************************************
- * SwDrawViewSave
+ * SwDrawViewSave
*
- * Saves some settings at the draw view
+ * Saves some settings at the draw view
******************************************************************************/
SwDrawViewSave::SwDrawViewSave( SdrView* pSdrView )
- : pDV( pSdrView )
+ : pDV( pSdrView )
{
- if ( pDV )
+ if ( pDV )
{
- sLayerNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM("Controls" ) );
- bPrintControls = pDV->IsLayerPrintable( sLayerNm );
- }
+ sLayerNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM("Controls" ) );
+ bPrintControls = pDV->IsLayerPrintable( sLayerNm );
+ }
}
SwDrawViewSave::~SwDrawViewSave()
{
- if ( pDV )
+ if ( pDV )
{
- pDV->SetLayerPrintable( sLayerNm, bPrintControls );
- }
+ pDV->SetLayerPrintable( sLayerNm, bPrintControls );
+ }
}
@@ -717,9 +717,9 @@ SwDrawViewSave::~SwDrawViewSave()
void ViewShell::PrepareForPrint( const SwPrintData &rOptions )
{
// Viewoptions fuer den Drucker setzen
- pOpt->SetGraphic ( sal_True == rOptions.bPrintGraphic );
+ pOpt->SetGraphic ( sal_True == rOptions.bPrintGraphic );
pOpt->SetTable ( sal_True == rOptions.bPrintTable );
- pOpt->SetDraw ( sal_True == rOptions.bPrintDraw );
+ pOpt->SetDraw ( sal_True == rOptions.bPrintDraw );
pOpt->SetControl ( sal_True == rOptions.bPrintControl );
pOpt->SetPageBack( sal_True == rOptions.bPrintPageBackground );
pOpt->SetBlackFont( sal_True == rOptions.bPrintBlackFont );
@@ -727,17 +727,18 @@ void ViewShell::PrepareForPrint( const SwPrintData
&rOptions )
if ( HasDrawView() )
{
SdrView *pDrawView = GetDrawView();
- String sLayerNm;
- sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
- // OD 09.01.2003 #i6467# - consider, if view shell belongs to page
preview
- if ( !IsPreView() )
- {
- pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl );
- }
- else
- {
- pDrawView->SetLayerVisible( sLayerNm, rOptions.bPrintControl );
- }
+ String sLayerNm;
+ sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" ));
+ // OD 09.01.2003 #i6467# - consider, if view shell belongs to
page preview
+ if ( !IsPreView() )
+ {
+ pDrawView->SetLayerPrintable( sLayerNm,
rOptions.bPrintControl );
+ }
+ else
+ {
+ pDrawView->SetLayerVisible( sLayerNm,
rOptions.bPrintControl );
+ }
}
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/tools/source/generic/poly2.cxx
b/main/tools/source/generic/poly2.cxx
index b1b4bf1abd..dc5c6b8736 100644
--- a/main/tools/source/generic/poly2.cxx
+++ b/main/tools/source/generic/poly2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -219,7 +219,7 @@ void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16
nPos )
{
DBG_CHKTHIS( PolyPolygon, NULL );
DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
- if ( nPos >= Count() ) return; // not replaceable
+ if ( nPos >= Count() ) return; // not replaceable
if ( mpImplPolyPolygon->mnRefCount > 1 )
{
@@ -363,7 +363,7 @@ void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult,
const double d ) cons
// -----------------------------------------------------------------------
void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon&
rResult ) const
-{
+{
ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_INT );
}
@@ -391,7 +391,7 @@ void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly,
PolyPolygon& rResult ) c
// -----------------------------------------------------------------------
void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon&
rResult, sal_uIntPtr nOperation ) const
-{
+{
// Convert to B2DPolyPolygon, temporarily. It might be
// advantageous in the future, to have a PolyPolygon adaptor that
// just simulates a B2DPolyPolygon here...
@@ -399,7 +399,7 @@ void PolyPolygon::ImplDoOperation( const PolyPolygon&
rPolyPoly, PolyPolygon& rR
basegfx::B2DPolyPolygon aMergePolyPolygonB(
rPolyPoly.getB2DPolyPolygon() );
// normalize the two polypolygons before. Force properly oriented
- // polygons.
+ // polygons.
aMergePolyPolygonA = basegfx::tools::prepareForPolygonOperation(
aMergePolyPolygonA );
aMergePolyPolygonB = basegfx::tools::prepareForPolygonOperation(
aMergePolyPolygonB );
@@ -871,7 +871,7 @@ PolyPolygon::PolyPolygon(const basegfx::B2DPolyPolygon&
rPolyPolygon)
{
DBG_CTOR( PolyPolygon, NULL );
const sal_uInt16 nCount(sal_uInt16(rPolyPolygon.count()));
- DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(),
+ DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(),
"PolyPolygon::PolyPolygon: Too many sub-polygons in given
basegfx::B2DPolyPolygon (!)");
if ( nCount )
@@ -890,4 +890,4 @@ PolyPolygon::PolyPolygon(const basegfx::B2DPolyPolygon&
rPolyPolygon)
}
}
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/inc/vcl/pdfextoutdevdata.hxx
b/main/vcl/inc/vcl/pdfextoutdevdata.hxx
index a9ccbfef1d..4dbe73d174 100644
--- a/main/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/main/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -79,18 +79,18 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData
const OutputDevice& mrOutDev;
- sal_Bool mbTaggedPDF;
+ sal_Bool mbTaggedPDF;
sal_Bool mbExportNotes;
sal_Bool
mbExportNotesPages;
sal_Bool mbTransitionEffects;
sal_Bool
mbUseLosslessCompression;
sal_Bool
mbReduceImageResolution;
- sal_Bool mbExportFormFields;
- sal_Bool mbExportBookmarks;
- sal_Bool mbExportNDests; //i56629
- sal_Int32 mnFormsFormat;
+ sal_Bool mbExportFormFields;
+ sal_Bool mbExportBookmarks;
+ sal_Bool mbExportNDests; //i56629
+ sal_Int32 mnFormsFormat;
sal_Int32 mnPage;
- com::sun::star::lang::Locale maDocLocale;
+ com::sun::star::lang::Locale maDocLocale;
PageSyncData* mpPageSyncData;
GlobalSyncData* mpGlobalSyncData;
@@ -122,17 +122,17 @@ public :
sal_Bool GetIsExportTransitionEffects() const;
void SetIsExportTransitionEffects( const sal_Bool
bTransitionalEffects );
- sal_Bool GetIsExportFormFields() const;
- void SetIsExportFormFields( const sal_Bool bExportFormFields );
+ sal_Bool GetIsExportFormFields() const;
+ void SetIsExportFormFields( const sal_Bool bExportFormFields );
sal_Int32 GetFormsFormat() const;
void SetFormsFormat( const sal_Int32 nFormsFormat );
- sal_Bool GetIsExportBookmarks() const;
- void SetIsExportBookmarks( const sal_Bool bExportBookmarks );
+ sal_Bool GetIsExportBookmarks() const;
+ void SetIsExportBookmarks( const sal_Bool bExportBookmarks );
- sal_Bool GetIsExportNamedDestinations() const; //i56629
- void SetIsExportNamedDestinations( const sal_Bool bExportNDests );
//i56629
+ sal_Bool GetIsExportNamedDestinations() const; //i56629
+ void SetIsExportNamedDestinations( const sal_Bool bExportNDests
); //i56629
// PageNumber, Compression is being set by the PDFExport
sal_Int32 GetCurrentPageNumber() const;
@@ -144,7 +144,7 @@ public :
sal_Bool GetIsReduceImageResolution() const;
void SetIsReduceImageResolution( const sal_Bool
bReduceImageResolution );
- const com::sun::star::lang::Locale& GetDocumentLocale() const;
+ const com::sun::star::lang::Locale& GetDocumentLocale() const;
void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc );
std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks();
@@ -192,13 +192,13 @@ public :
//--->i56629
/** Create a new named destination to be used in a link to this document
from another PDF document
(see PDF spec 1.4, 8.2.1)
-
- @parm sDestName
+
+ @param sDestName
the name this destination will be addressed with from others PDF document
@param rRect
target rectangle on page to be displayed if dest is jumped to
-
+
@param nPageNr
number of page the dest is on (as returned by NewPage)
or -1 in which case the current page is used
@@ -212,7 +212,7 @@ public :
*/
sal_Int32 CreateNamedDest( const String& sDestName, const Rectangle&
rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
- /** registers a destination for which a destinatin ID needs to be known
immediately, instead of later on setting it via
+ /** registers a destination for which a destination ID needs to be known
immediately, instead of later on setting it via
SetLinkDest.
This is used in contexts where a destination is referenced by means
other than a link.
@@ -235,7 +235,7 @@ public :
@param rRect
target rectangle on page to be displayed if dest is jumped to
-
+
@param nPageNr
number of page the dest is on (as returned by NewPage)
or -1 in which case the current page is used
@@ -281,14 +281,14 @@ public :
<p>will change a dest type link to an URL type link if necessary</p>
@param nLinkId
the link to be changed
-
+
@param rURL
the URL the link shall point to.
there will be no error checking or any kind of
- conversion done to this parameter execept this:
+ conversion done to this parameter except this:
it will be output as 7bit Ascii. The URL
will appear literally in the PDF file produced
-
+
@returns
0 for success
-1 in case the link id does not exist
@@ -340,7 +340,7 @@ public :
-1 if the item does not exist
*/
sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText
);
-
+
/** Set an outline item's destination
@param nItem
@@ -407,7 +407,7 @@ public :
*/
sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const
rtl::OUString& rAlias = rtl::OUString() );
/** end a logical structure element
-
+
@see BeginStructureElement
*/
void EndStructureElement();
@@ -415,9 +415,9 @@ public :
<p>
For different purposes it may be useful to paint a structure element's
- content discontinously. In that case an already existing structure element
+ content discontinuously. In that case an already existing structure element
can be appended to by using <code>SetCurrentStructureElement</code>. The
- refenrenced structure element becomes the current structure element with
+ referenced structure element becomes the current structure element with
all consequences: all following structure elements are appended as children
of the current element.
</p>
@@ -432,14 +432,14 @@ public :
*/
bool SetCurrentStructureElement( sal_Int32 nElement );
/** get the current structure element id
-
+
@returns
the id of the current structure element
*/
sal_Int32 GetCurrentStructureElement();
/** set a structure attribute on the current structural element
-
+
SetStructureAttribute sets an attribute of the current structural element
to a
new value. A consistency check is performed before actually setting the
value;
if the check fails, the function returns <FALSE/> and the attribute remains
@@ -457,7 +457,7 @@ public :
*/
bool SetStructureAttribute( PDFWriter::StructAttribute eAttr,
PDFWriter::StructAttributeValue eVal );
/** set a structure attribute on the current structural element
-
+
SetStructureAttributeNumerical sets an attribute of the current structural
element
to a new numerical value. A consistency check is performed before actually
setting
the value; if the check fails, the function returns <FALSE/> and the
attribute
@@ -498,7 +498,7 @@ public :
*/
void SetActualText( const String& rText );
- /** set the Alt attribute of a strutural element
+ /** set the Alt attribute of a structural element
Alt is s replacement text describing the contents of a structural element.
This
is mainly used by accessibility applications; e.g. a screen reader would
read
@@ -542,7 +542,7 @@ public :
will be cast to the type described by the type member.
@param rControlType
- a descendant of <code>AnyWidget</code> determing the control's properties
+ a descendant of <code>AnyWidget</code> determining the control's properties
*/
void CreateControl( const PDFWriter::AnyWidget& rControlType, sal_Int32
nPageNr = -1 );
};
@@ -550,3 +550,5 @@ public :
}
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/inc/vcl/pdfwriter.hxx b/main/vcl/inc/vcl/pdfwriter.hxx
index aa996ab952..2bada9e267 100644
--- a/main/vcl/inc/vcl/pdfwriter.hxx
+++ b/main/vcl/inc/vcl/pdfwriter.hxx
@@ -884,7 +884,7 @@ The following structure describes the permissions used in
PDF security
/** Create a new named destination to be used in a link from another
PDF document
- @parm sDestName
+ @param sDestName
the name (label) of the bookmark, to be used to jump to
@param rRect
@@ -1242,7 +1242,7 @@ The following structure describes the permissions used in
PDF security
*/
void SetActualText( const String& rText );
- /** set the Alt attribute of a strutural element
+ /** set the Alt attribute of a structural element
Alt is s replacement text describing the contents of a structural
element. This
is mainly used by accessibility applications; e.g. a screen reader
would read
@@ -1310,7 +1310,7 @@ The following structure describes the permissions used in
PDF security
the interface to the additional stream
@param bCompress
- specifies whether the stream should be flate encoded by PDFWriter or not
+ specifies whether the stream should be flat encoded by PDFWriter or not
*/
void AddStream( const String& rMimeType, PDFOutputStream* pStream, bool
bCompress );
diff --git a/main/writerfilter/inc/resourcemodel/TableData.hxx
b/main/writerfilter/inc/resourcemodel/TableData.hxx
index 6fad93719c..e9661f7628 100644
--- a/main/writerfilter/inc/resourcemodel/TableData.hxx
+++ b/main/writerfilter/inc/resourcemodel/TableData.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -93,10 +93,10 @@ public:
@param pProps the properties to add
*/
- void insertProperties(PropertiesPointer pProps)
- {
+ void insertProperties(PropertiesPointer pProps)
+ {
if( mpProps.get() )
- mpProps->insert(pProps);
+ mpProps->insert(pProps);
else
mpProps = pProps;
}
@@ -202,7 +202,7 @@ public:
{
mCells[i]->insertProperties(pProps);
}
-
+
/**
Add properties to the last cell of the row.
*/
@@ -337,8 +337,8 @@ public:
/**
End the current cell of the current row.
-
- @parm end end handle of the cell
+
+ @param end end handle of the cell
*/
void endCell(const T & end)
{
@@ -352,10 +352,10 @@ public:
{
return mpRow->isCellOpen();
}
-
+
/**
Insert properties to the current cell of the current row.
-
+
@param pProps the properties to add
*/
void insertCellProperties(PropertiesPointer pProps)
@@ -385,7 +385,7 @@ public:
/**
Return the table properties.
*/
- PropertiesPointer getTableProperties( )
+ PropertiesPointer getTableProperties( )
{
return mpTableProps;
}
@@ -420,3 +420,5 @@ public:
}
#endif // INCLUDED_TABLE_DATA
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/writerfilter/inc/resourcemodel/TableManager.hxx
b/main/writerfilter/inc/resourcemodel/TableManager.hxx
index cf92f1884e..2c154bb148 100644
--- a/main/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/main/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -577,7 +577,7 @@ public:
/**
Handle properties of a certain cell in the current row.
- @paran i index of the cell in the current row
+ @param i index of the cell in the current row
@param pProps the properties
*/
virtual void cellPropsByCell(unsigned int i, PropertiesPointer pProps);
@@ -1090,3 +1090,5 @@ void TableManager<T,
PropertiesPointer>::ensureOpenCell(PropertiesPointer pProps
}
#endif // INCLUDED_TABLE_MANAGER_HXX
+
+/* vim: set noet sw=4 ts=4: */
