[Libreoffice-commits] core.git: 11 commits - cppuhelper/source editeng/source filter/source fpicker/source framework/inc framework/qa framework/source icon-themes/galaxy include/connectivity include/sfx2 include/ucbhelper include/unotools include/xmloff javaunohelper/com odk/examples sd/inc sd/source sfx2/source svx/source UnoControls/source unotools/source uui/source xmloff/source
Jan Holesovsky
kendy at collabora.com
Sat Apr 26 16:38:56 PDT 2014
UnoControls/source/base/basecontainercontrol.cxx | 2
UnoControls/source/base/basecontrol.cxx | 2
UnoControls/source/controls/progressbar.cxx | 2
UnoControls/source/controls/progressmonitor.cxx | 6
UnoControls/source/controls/statusindicator.cxx | 6
cppuhelper/source/component.cxx | 2
cppuhelper/source/propshlp.cxx | 4
editeng/source/editeng/impedit3.cxx | 2
filter/source/config/cache/basecontainer.cxx | 2
filter/source/config/cache/basecontainer.hxx | 4
filter/source/config/cache/filtercache.cxx | 18
filter/source/config/cache/filtercache.hxx | 8
fpicker/source/office/fpsmartcontent.cxx | 4
fpicker/source/win32/filepicker/PreviewCtrl.cxx | 2
fpicker/source/win32/filepicker/dibpreview.cxx | 2
fpicker/source/win32/filepicker/helppopupwindow.cxx | 2
framework/inc/classes/checkediterator.hxx | 2
framework/inc/classes/protocolhandlercache.hxx | 2
framework/inc/dispatch/mailtodispatcher.hxx | 2
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/dispatch/servicehandler.hxx | 2
framework/inc/dispatch/systemexec.hxx | 2
framework/inc/helper/statusindicatorfactory.hxx | 2
framework/inc/jobs/helponstartup.hxx | 2
framework/inc/macros/xtypeprovider.hxx | 4
framework/inc/taskcreatordefs.hxx | 2
framework/inc/threadhelp/gate.hxx | 2
framework/inc/threadhelp/itransactionmanager.h | 2
framework/inc/threadhelp/transactionguard.hxx | 4
framework/inc/threadhelp/transactionmanager.hxx | 2
framework/qa/complex/dispatches/checkdispatchapi.java | 2
framework/qa/complex/loadAllDocuments/StatusIndicator.java | 2
framework/source/accelerators/acceleratorcache.cxx | 2
framework/source/accelerators/acceleratorconfiguration.cxx | 2
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/fwi/classes/protocolhandlercache.cxx | 4
framework/source/inc/accelerators/presethandler.hxx | 4
framework/source/jobs/job.cxx | 2
framework/source/jobs/jobdata.cxx | 6
framework/source/layoutmanager/layoutmanager.cxx | 2
framework/source/services/desktop.cxx | 8
framework/source/services/frame.cxx | 6
framework/source/services/taskcreatorsrv.cxx | 2
icon-themes/galaxy/res/recentdoc_remove.png |binary
icon-themes/galaxy/res/recentdoc_remove_highlighted.png |binary
include/connectivity/dbmetadata.hxx | 2
include/sfx2/recentdocsview.hxx | 15
include/sfx2/recentdocsviewitem.hxx | 25
include/sfx2/thumbnailview.hxx | 13
include/sfx2/thumbnailviewitem.hxx | 10
include/ucbhelper/interceptedinteraction.hxx | 8
include/unotools/historyoptions.hxx | 184 +--
include/unotools/mediadescriptor.hxx | 6
include/unotools/viewoptions.hxx | 2
include/xmloff/shapeexport.hxx | 2
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java | 6
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 12
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java | 6
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 2
odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java | 2
odk/examples/java/DocumentHandling/DocumentLoader.java | 2
odk/examples/java/DocumentHandling/DocumentPrinter.java | 2
odk/examples/java/Inspector/TestInspector.java | 2
odk/examples/java/NotesAccess/NotesAccess.java | 2
odk/examples/java/Spreadsheet/ChartTypeChange.java | 4
odk/examples/java/Text/GraphicsInserter.java | 2
sd/inc/Outliner.hxx | 2
sd/source/core/pglink.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/bastyp/fltlst.cxx | 2
sfx2/source/control/recentdocsview.cxx | 76 -
sfx2/source/control/recentdocsviewitem.cxx | 154 +++
sfx2/source/control/templateview.hrc | 12
sfx2/source/control/templateview.src | 10
sfx2/source/control/thumbnailview.cxx | 33
sfx2/source/control/thumbnailviewitem.cxx | 25
sfx2/source/dialog/backingcomp.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/doc/printhelper.cxx | 8
svx/source/inc/docrecovery.hxx | 4
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoshcol.cxx | 2
unotools/source/config/historyoptions.cxx | 501 +++++-----
uui/source/fltdlg.cxx | 2
xmloff/source/style/xmlexppr.cxx | 4
93 files changed, 723 insertions(+), 595 deletions(-)
New commits:
commit 60cd850d672bc1dcc3eb24adfffa7a6ab98a44bd
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sun Apr 27 01:21:50 2014 +0200
startcenter: Add possibility to selectively remove recent documents.
Change-Id: Id0c20de6dc3375e64dd3dbef34dcd6eb77f02340
diff --git a/icon-themes/galaxy/res/recentdoc_remove.png b/icon-themes/galaxy/res/recentdoc_remove.png
new file mode 100644
index 0000000..88e3f0c
Binary files /dev/null and b/icon-themes/galaxy/res/recentdoc_remove.png differ
diff --git a/icon-themes/galaxy/res/recentdoc_remove_highlighted.png b/icon-themes/galaxy/res/recentdoc_remove_highlighted.png
new file mode 100644
index 0000000..5492295
Binary files /dev/null and b/icon-themes/galaxy/res/recentdoc_remove_highlighted.png differ
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index ca7dd23..c1ba062 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -38,15 +38,13 @@ enum ApplicationType
};
-class SFX2_DLLPUBLIC RecentDocsView : protected ::comphelper::OBaseMutex,
- public ThumbnailView
+class SFX2_DLLPUBLIC RecentDocsView : public ThumbnailView
{
public:
RecentDocsView( Window* pParent );
virtual ~RecentDocsView();
void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId);
- void loadRecentDocs();
long GetThumbnailSize() const;
@@ -57,12 +55,18 @@ public:
virtual void Clear() SAL_OVERRIDE;
+ /// Update the information in the view.
+ virtual void Reload() SAL_OVERRIDE;
+
DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* );
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+
+ virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+
virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
- void OpenItem( const ThumbnailViewItem *pItem );
+
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
@@ -74,7 +78,8 @@ protected:
long mnItemPadding;
long mnItemMaxTextLength;
- Image maWelcomeImage;
+ /// Image that appears when there is no recent document.
+ Image maWelcomeImage;
OUString maWelcomeLine1;
OUString maWelcomeLine2;
};
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index e074296..96cd84c 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -19,13 +19,36 @@ public:
const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId);
virtual void setEditTitle (bool edit, bool bChangeFocus = true) SAL_OVERRIDE;
+ /** Updates own highlight status based on the aPoint position.
+
+ Calls the ancestor's updateHighlight, and then takes care of m_bRemoveIconHighlighted.
+
+ Returns rectangle that needs to be invalidated.
+ */
+ virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint) SAL_OVERRIDE;
+
/// Text to be used for the tooltip.
virtual OUString getHelpText() const SAL_OVERRIDE;
- OUString maURL;
+ virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor,
+ const ThumbnailItemAttributes *pAttrs);
+
+ virtual void MouseButtonUp(const MouseEvent& rMEvt);
+
+ /// Called when the user clicks a document - it will open it.
+ void OpenDocument();
+
+protected:
+ /// Return area where is the icon to remove document from the recent documents.
+ Rectangle getRemoveIconArea() const;
private:
+ OUString maURL;
+
OUString m_sHelpText;
+
+ /// Is the icon that the user can click to remove the document from the recent documents highlighted?
+ bool m_bRemoveIconHighlighted;
};
#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 068c01e..b760426 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -180,18 +180,21 @@ class SFX2_DLLPUBLIC ThumbnailView : public Control
{
public:
- ThumbnailView ( Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false );
+ ThumbnailView(Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false);
- virtual ~ThumbnailView ();
+ virtual ~ThumbnailView();
- virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
- void AppendItem (ThumbnailViewItem *pItem);
+ void AppendItem(ThumbnailViewItem *pItem);
- void RemoveItem( sal_uInt16 nItemId );
+ void RemoveItem(sal_uInt16 nItemId);
virtual void Clear();
+ /// Updates information in the view; used only in RecentDocsView ATM.
+ virtual void Reload() {}
+
// Change current thumbnail item list with new one (invalidates all pointers to a thumbnail item)
void updateItems(const std::vector<ThumbnailViewItem *> &items);
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index eea0e45..ee4fd7f 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -32,6 +32,8 @@
#define THUMBNAILVIEW_ITEM_NONEITEM 0xFFFE
+const int THUMBNAILVIEW_ITEM_CORNER = 5;
+
class CheckBox;
class Font;
class Window;
@@ -89,6 +91,12 @@ public:
void setHighlight (bool state);
+ /** Updates own highlight status based on the aPoint position.
+
+ Returns rectangle that needs to be invalidated.
+ */
+ virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint);
+
/// Text to be used for the tooltip.
virtual OUString getHelpText() const;
@@ -121,6 +129,8 @@ public:
static drawinglayer::primitive2d::PolygonHairlinePrimitive2D*
createBorderLine (const basegfx::B2DPolygon &rPolygon);
+ virtual void MouseButtonUp(const MouseEvent&) {}
+
protected:
Point maTextPos;
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 51e44b2..0564e8b 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -26,7 +26,6 @@
#include <unotools/historyoptions.hxx>
#include <vcl/builder.hxx>
#include <vcl/pngread.hxx>
-#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@@ -148,7 +147,7 @@ void RecentDocsView::insertItem(const OUString &rURL, const OUString &rTitle, co
AppendItem(pChild);
}
-void RecentDocsView::loadRecentDocs()
+void RecentDocsView::Reload()
{
Clear();
@@ -212,78 +211,33 @@ void RecentDocsView::loadRecentDocs()
void RecentDocsView::MouseButtonDown( const MouseEvent& rMEvt )
{
- if ( rMEvt.IsLeft() )
+ if (rMEvt.IsLeft())
{
- if( rMEvt.GetClicks() > 1 )
- return;
+ // ignore to avoid stuff done in ThumbnailView; we don't do selections etc.
+ return;
+ }
+ ThumbnailView::MouseButtonDown(rMEvt);
+}
+
+void RecentDocsView::MouseButtonUp(const MouseEvent& rMEvt)
+{
+ if (rMEvt.IsLeft())
+ {
size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
ThumbnailViewItem* pItem = ImplGetItem(nPos);
if (pItem)
{
- OpenItem(pItem);
+ pItem->MouseButtonUp(rMEvt);
return;
}
}
- ThumbnailView::MouseButtonDown( rMEvt );
+ ThumbnailView::MouseButtonUp(rMEvt);
}
-void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *pItem)
+void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *)
{
- OpenItem( pItem );
-}
-
-void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
-{
- const RecentDocsViewItem* pRecentItem = dynamic_cast<const RecentDocsViewItem*>(pItem);
- if (!pRecentItem)
- return;
-
- // show busy mouse pointer
- SetPointer(Pointer(POINTER_WAIT));
-
- Reference< XDispatch > xDispatch;
- Reference< XDispatchProvider > xDispatchProvider;
- css::util::URL aTargetURL;
- Sequence< PropertyValue > aArgsList;
-
- uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( ::comphelper::getProcessComponentContext() );
- uno::Reference< frame::XFrame > xActiveFrame = xDesktop->getActiveFrame();
-
- osl::ClearableMutexGuard aLock( m_aMutex );
- xDispatchProvider = Reference< XDispatchProvider >( xActiveFrame, UNO_QUERY );
- aLock.clear();
-
- aTargetURL.Complete = pRecentItem->maURL;
- Reference< ::com::sun::star::util::XURLTransformer > xTrans(
- ::com::sun::star::util::URLTransformer::create(
- ::comphelper::getProcessComponentContext() ) );
- xTrans->parseStrict( aTargetURL );
-
- sal_Int32 nSize = 2;
- aArgsList.realloc( nSize );
- aArgsList[0].Name = "Referer";
- aArgsList[0].Value = makeAny( OUString( "private:user" ) );
-
- // documents will never be opened as templates
- aArgsList[1].Name = "AsTemplate";
- aArgsList[1].Value = makeAny( false );
-
- xDispatch = xDispatchProvider->queryDispatch( aTargetURL, "_default", 0 );
-
- if ( xDispatch.is() )
- {
- // Call dispatch asychronously as we can be destroyed while dispatch is
- // executed. VCL is not able to survive this as it wants to call listeners
- // after select!!!
- LoadRecentFile* pLoadRecentFile = new LoadRecentFile;
- pLoadRecentFile->xDispatch = xDispatch;
- pLoadRecentFile->aTargetURL = aTargetURL;
- pLoadRecentFile->aArgSeq = aArgsList;
-
- Application::PostUserEvent( STATIC_LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile );
- }
}
void RecentDocsView::Paint( const Rectangle &aRect )
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 8c64fb4..b6f7274 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -9,15 +9,52 @@
#include <sfx2/recentdocsviewitem.hxx>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <i18nutil/paper.hxx>
-#include <sfx2/templateabstractview.hxx>
#include <sfx2/recentdocsview.hxx>
+#include <sfx2/sfxresid.hxx>
+#include <sfx2/templateabstractview.hxx>
#include <tools/urlobj.hxx>
+#include <unotools/historyoptions.hxx>
+#include <vcl/svapp.hxx>
+
+#include <templateview.hrc>
+
+using namespace basegfx;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace drawinglayer::primitive2d;
+using namespace drawinglayer::processor2d;
+
+/// Icon that the user can click to remove the document from the recent documents.
+struct theRemoveRecentBitmap : public rtl::StaticWithInit<BitmapEx, theRemoveRecentBitmap>
+{
+ BitmapEx operator()()
+ {
+ return SfxResId(IMG_RECENTDOC_REMOVE);
+ }
+
+};
+
+/// Highlighted version of icon that the user can click to remove the document from the recent documents.
+struct theRemoveRecentBitmapHighlighted : public rtl::StaticWithInit<BitmapEx, theRemoveRecentBitmapHighlighted>
+{
+ BitmapEx operator()()
+ {
+ return SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED);
+ }
+
+};
RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL,
const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId)
: ThumbnailViewItem(rView, nId),
- maURL(rURL)
+ maURL(rURL),
+ m_bRemoveIconHighlighted(false)
{
OUString aTitle(rTitle);
INetURLObject aURLObj(rURL);
@@ -89,9 +126,122 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool bChangeFocus)
(void)bChangeFocus;
}
+Rectangle RecentDocsViewItem::updateHighlight(bool bVisible, const Point& rPoint)
+{
+ Rectangle aRect(ThumbnailViewItem::updateHighlight(bVisible, rPoint));
+
+ if (bVisible && getRemoveIconArea().IsInside(rPoint))
+ {
+ if (!m_bRemoveIconHighlighted)
+ aRect.Union(getRemoveIconArea());
+
+ m_bRemoveIconHighlighted = true;
+ }
+ else
+ {
+ if (m_bRemoveIconHighlighted)
+ aRect.Union(getRemoveIconArea());
+
+ m_bRemoveIconHighlighted = false;
+ }
+
+ return aRect;
+}
+
+Rectangle RecentDocsViewItem::getRemoveIconArea() const
+{
+ Rectangle aArea(getDrawArea());
+ Size aSize(theRemoveRecentBitmap::get().GetSizePixel());
+
+ return Rectangle(
+ Point(aArea.Right() - aSize.Width() - THUMBNAILVIEW_ITEM_CORNER, aArea.Top() + THUMBNAILVIEW_ITEM_CORNER),
+ aSize);
+}
+
OUString RecentDocsViewItem::getHelpText() const
{
return m_sHelpText;
}
+void RecentDocsViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs)
+{
+ ThumbnailViewItem::Paint(pProcessor, pAttrs);
+
+ // paint the remove icon when highlighted
+ if (isHighlighted())
+ {
+ Primitive2DSequence aSeq(1);
+
+ Point aIconPos(getRemoveIconArea().TopLeft());
+
+ aSeq[0] = Primitive2DReference(new DiscreteBitmapPrimitive2D(
+ m_bRemoveIconHighlighted? theRemoveRecentBitmapHighlighted::get(): theRemoveRecentBitmap::get(),
+ B2DPoint(aIconPos.X(), aIconPos.Y())));
+
+ pProcessor->process(aSeq);
+ }
+}
+
+void RecentDocsViewItem::MouseButtonUp(const MouseEvent& rMEvt)
+{
+ if (rMEvt.IsLeft())
+ {
+ if (getRemoveIconArea().IsInside(rMEvt.GetPosPixel()))
+ {
+ SvtHistoryOptions().DeleteItem(ePICKLIST, maURL);
+ mrParent.Reload();
+ return;
+ }
+
+ OpenDocument();
+ return;
+ }
+}
+
+void RecentDocsViewItem::OpenDocument()
+{
+ // show busy mouse pointer
+ mrParent.SetPointer(Pointer(POINTER_WAIT));
+
+ Reference<frame::XDispatch> xDispatch;
+ Reference<frame::XDispatchProvider> xDispatchProvider;
+ css::util::URL aTargetURL;
+ Sequence<beans::PropertyValue> aArgsList;
+
+ uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(::comphelper::getProcessComponentContext());
+ uno::Reference<frame::XFrame> xActiveFrame = xDesktop->getActiveFrame();
+
+ //osl::ClearableMutexGuard aLock(m_aMutex);
+ xDispatchProvider = Reference<frame::XDispatchProvider>(xActiveFrame, UNO_QUERY);
+ //aLock.clear();
+
+ aTargetURL.Complete = maURL;
+ Reference<util::XURLTransformer> xTrans(util::URLTransformer::create(::comphelper::getProcessComponentContext()));
+ xTrans->parseStrict(aTargetURL);
+
+ sal_Int32 nSize = 2;
+ aArgsList.realloc(nSize);
+ aArgsList[0].Name = "Referer";
+ aArgsList[0].Value = makeAny(OUString("private:user"));
+
+ // documents will never be opened as templates
+ aArgsList[1].Name = "AsTemplate";
+ aArgsList[1].Value = makeAny(false);
+
+ xDispatch = xDispatchProvider->queryDispatch(aTargetURL, "_default", 0);
+
+ if (xDispatch.is())
+ {
+ // Call dispatch asychronously as we can be destroyed while dispatch is
+ // executed. VCL is not able to survive this as it wants to call listeners
+ // after select!!!
+ LoadRecentFile* pLoadRecentFile = new LoadRecentFile;
+ pLoadRecentFile->xDispatch = xDispatch;
+ pLoadRecentFile->aTargetURL = aTargetURL;
+ pLoadRecentFile->aArgSeq = aArgsList;
+
+ Application::PostUserEvent(STATIC_LINK(0, RecentDocsView, ExecuteHdl_Impl), pLoadRecentFile);
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc
index 95bf930..d2073bc 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -7,10 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#define BTN_ALL_TEMPLATES 256
-#define FT_NAME 258
-#define STR_WELCOME_LINE1 259
-#define STR_WELCOME_LINE2 260
-#define IMG_WELCOME 261
+#define BTN_ALL_TEMPLATES 256
+#define FT_NAME 258
+#define STR_WELCOME_LINE1 259
+#define STR_WELCOME_LINE2 260
+#define IMG_WELCOME 261
+#define IMG_RECENTDOC_REMOVE 262
+#define IMG_RECENTDOC_REMOVE_HIGHLIGHTED 263
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src b/sfx2/source/control/templateview.src
index 49fe015..70f3ff3 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -38,4 +38,14 @@ Image IMG_WELCOME
ImageBitmap = Bitmap { File = "logo.png" ; };
};
+Bitmap IMG_RECENTDOC_REMOVE
+{
+ File = "recentdoc_remove.png";
+};
+
+Bitmap IMG_RECENTDOC_REMOVE_HIGHLIGHTED
+{
+ File = "recentdoc_remove_highlighted.png";
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 53a0564..884084d 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -87,26 +87,17 @@ void ThumbnailView::MouseMove(const MouseEvent& rMEvt)
for (size_t i = 0; i < nItemCount; i++)
{
- bool bNeedsPaint = false;
ThumbnailViewItem *pItem = mFilteredItemList[i];
if (pItem->mbVisible && !rMEvt.IsLeaveWindow() && pItem->getDrawArea().IsInside(aPoint))
{
aHelp = pItem->getHelpText();
-
- if (!pItem->isHighlighted())
- bNeedsPaint = true;
- pItem->setHighlight(true);
- }
- else
- {
- if (pItem->isHighlighted())
- bNeedsPaint = true;
- pItem->setHighlight(false);
}
- if (bNeedsPaint && IsReallyVisible() && IsUpdateMode())
- Invalidate(pItem->getDrawArea());
+ Rectangle aToInvalidate(pItem->updateHighlight(pItem->mbVisible && !rMEvt.IsLeaveWindow(), aPoint));
+
+ if (!aToInvalidate.IsEmpty() && IsReallyVisible() && IsUpdateMode())
+ Invalidate(aToInvalidate);
}
if (mbShowTooltips)
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index ee72c1f..9d66868 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -146,6 +146,29 @@ void ThumbnailViewItem::setHighlight (bool state)
mbHover = state;
}
+Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, const Point& rPoint)
+{
+ bool bNeedsPaint = false;
+
+ if (bVisible && getDrawArea().IsInside(rPoint))
+ {
+ if (!isHighlighted())
+ bNeedsPaint = true;
+ setHighlight(true);
+ }
+ else
+ {
+ if (isHighlighted())
+ bNeedsPaint = true;
+ setHighlight(false);
+ }
+
+ if (bNeedsPaint)
+ return getDrawArea();
+
+ return Rectangle();
+}
+
OUString ThumbnailViewItem::getHelpText() const
{
return maTitle;
@@ -265,7 +288,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
sal_uInt32 nPrimitive = 0;
aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonSelectionPrimitive2D(
- B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()),
+ B2DPolyPolygon(Polygon(maDrawArea, THUMBNAILVIEW_ITEM_CORNER, THUMBNAILVIEW_ITEM_CORNER).getB2DPolygon()),
aFillColor,
fTransparence,
0.0,
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index f988fc7..9c17757 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -224,7 +224,7 @@ void BackingWindow::initControls()
mpAllRecentThumbnails->mnFileTypes |= TYPE_MATH;
mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER;
- mpAllRecentThumbnails->loadRecentDocs();
+ mpAllRecentThumbnails->Reload();
mpAllRecentThumbnails->ShowTooltips( true );
setupButton( mpOpenButton );
commit 978ba69d33cf31cd334f18af5215166dd3926402
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sat Apr 26 19:33:54 2014 +0200
recent documents: Add possibility to remove individual documents.
Change-Id: Icf059ff9a911592ab09fc385aadbec9be8ed664a
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 165b988..d361770 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -82,12 +82,9 @@ public:
*/
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList(EHistoryType eHistory) const;
- /** Append a new item to specified list
+ /** Append a new item to the specified list.
- You can append items to a list only - removing isn't allowed for a special item.
- The oldest entry is deleted automatically if max size arrived or you can call Clear() ...
- It exist two different overload methods to do this.
- One for user which have an complete history item and another one for uncompletly data sets!
+ The oldest entry is deleted automatically when the size reaches the maximum.
@param eHistory select right history.
@param sURL URL to save in history
@@ -99,6 +96,10 @@ public:
const OUString& sURL, const OUString& sFilter, const OUString& sTitle,
const OUString& sPassword, const OUString& sThumbnail);
+ /** Delete item from the specified list.
+ */
+ void DeleteItem(EHistoryType eHistory, const OUString& sURL);
+
private:
/* Attention
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 4f5dc38..ea87bed 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -89,6 +89,8 @@ public:
const OUString& sURL, const OUString& sFilter, const OUString& sTitle,
const OUString& sPassword, const OUString& sThumbnail);
+ void DeleteItem(EHistoryType eHistory, const OUString& sURL);
+
private:
/// Return the appropriate list of recent documents (based on eHistory).
uno::Reference<container::XNameAccess> GetListAccess(EHistoryType eHistory) const;
@@ -473,6 +475,70 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
}
}
+void SvtHistoryOptions_Impl::DeleteItem(EHistoryType eHistory, const OUString& sURL)
+{
+ uno::Reference<container::XNameAccess> xListAccess(GetListAccess(eHistory));
+ if (!xListAccess.is())
+ return;
+
+ uno::Reference<container::XNameContainer> xItemList;
+ uno::Reference<container::XNameContainer> xOrderList;
+ uno::Reference<beans::XPropertySet> xSet;
+
+ try
+ {
+ xListAccess->getByName(s_sItemList) >>= xItemList;
+ xListAccess->getByName(s_sOrderList) >>= xOrderList;
+ sal_Int32 nLength = xOrderList->getElementNames().getLength();
+
+ // if it does not exist, nothing to do
+ if (!xItemList->hasByName(sURL))
+ return;
+
+ // it's the last one, just clear the lists
+ if (nLength == 1)
+ {
+ Clear(eHistory);
+ return;
+ }
+
+ // find it in the OrderList
+ sal_Int32 nFromWhere = 0;
+ for (; nFromWhere < nLength - 1; ++nFromWhere)
+ {
+ OUString aItem;
+ xOrderList->getByName(OUString::number(nFromWhere)) >>= xSet;
+ xSet->getPropertyValue(s_sHistoryItemRef) >>= aItem;
+
+ if (aItem == sURL)
+ break;
+ }
+
+ // and shift the rest of the items in OrderList accordingly
+ for (sal_Int32 i = nFromWhere; i < nLength - 1; ++i)
+ {
+ uno::Reference<beans::XPropertySet> xPrevSet;
+ uno::Reference<beans::XPropertySet> xNextSet;
+ xOrderList->getByName(OUString::number(i)) >>= xPrevSet;
+ xOrderList->getByName(OUString::number(i + 1)) >>= xNextSet;
+
+ OUString sTemp;
+ xNextSet->getPropertyValue(s_sHistoryItemRef) >>= sTemp;
+ xPrevSet->setPropertyValue(s_sHistoryItemRef, uno::makeAny(sTemp));
+ }
+ xOrderList->removeByName(OUString::number(nLength - 1));
+
+ // and finally remove it from the ItemList
+ xItemList->removeByName(sURL);
+
+ ::comphelper::ConfigurationHelper::flush(m_xCfg);
+ }
+ catch (const uno::Exception& ex)
+ {
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
+ }
+}
+
// initialize static member
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
@@ -544,4 +610,11 @@ void SvtHistoryOptions::AppendItem(EHistoryType eHistory,
m_pDataContainer->AppendItem(eHistory, sURL, sFilter, sTitle, sPassword, sThumbnail);
}
+void SvtHistoryOptions::DeleteItem(EHistoryType eHistory, const OUString& sURL)
+{
+ MutexGuard aGuard(theHistoryOptionsMutex::get());
+
+ m_pDataContainer->DeleteItem(eHistory, sURL);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e6ac6cbccf0e26b860b2a8c276fea258091d9da3
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sat Apr 26 19:28:59 2014 +0200
automaticly -> automatically.
Change-Id: Iae55083160eee86ac8301f272634dd3ae65fd847
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 6280fba..7608ad2 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -395,7 +395,7 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( Runt
// is it a top window ?
if ( !getContext().is() && bVisible )
{
- // then show it automaticly
+ // then show it automatically
createPeer ( Reference< XToolkit > (), Reference< XWindowPeer > () );
}
}
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 3283e7e..312bd6b 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -784,7 +784,7 @@ void BaseControl::impl_paint( sal_Int32 /*nX*/
void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
{
- // We need as virtual function to support automaticly resizing of derived controls!
+ // We need as virtual function to support automatically resizing of derived controls!
// But we make it not pure virtual because it's not necessary for all derived classes!
}
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 28c7411..e657dd5 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -237,7 +237,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
}
else
{
- // Change Min and Max automaticly
+ // Change Min and Max automatically
m_nMinRange = nMax;
m_nMaxRange = nMin;
}
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index c650dbe..4e7e114 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -82,12 +82,12 @@ ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >
addControl ( CONTROLNAME_BUTTON, xRef_Button );
addControl ( CONTROLNAME_PROGRESSBAR, m_xProgressBar.get() );
- // FixedText make it automaticly visible by himself ... but not the progressbar !!!
+ // FixedText make it automatically visible by himself ... but not the progressbar !!!
// it must be set explicitly
m_xProgressBar->setVisible( sal_True );
// Reset to defaults !!!
- // (progressbar take automaticly its own defaults)
+ // (progressbar take automatically its own defaults)
m_xButton->setLabel ( DEFAULT_BUTTONLABEL );
m_xTopic_Top->setText ( PROGRESSMONITOR_DEFAULT_TOPIC );
m_xText_Top->setText ( PROGRESSMONITOR_DEFAULT_TEXT );
@@ -535,7 +535,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
// calc new layout for controls
impl_recalcLayout ();
// clear background (!)
- // [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
+ // [Children were repainted in "recalcLayout" by setPosSize() automatically!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() );
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 8a05647..4acfdfa 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -55,11 +55,11 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
// ... and add controls to basecontainercontrol!
addControl( CONTROLNAME_TEXT, xTextControl );
addControl( CONTROLNAME_PROGRESSBAR, m_xProgressBar.get() );
- // FixedText make it automaticly visible by himself ... but not the progressbar !!!
+ // FixedText make it automatically visible by himself ... but not the progressbar !!!
// it must be set explicitly
m_xProgressBar->setVisible( sal_True );
// Reset to defaults !!!
- // (progressbar take automaticly its own defaults)
+ // (progressbar take automatically its own defaults)
m_xText->setText( STATUSINDICATOR_DEFAULT_TEXT );
--m_refCount;
@@ -349,7 +349,7 @@ void SAL_CALL StatusIndicator::setPosSize (
// calc new layout for controls
impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,nWidth,nHeight,0,0,0,0) );
// clear background (!)
- // [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
+ // [Children were repainted in "recalcLayout" by setPosSize() automatically!]
getPeer()->invalidate(2);
// and repaint the control
impl_paint ( 0, 0, impl_getGraphicsPeer() );
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 0975b8d..8997eec 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -172,7 +172,7 @@ void OComponentHelper::dispose()
EventObject aEvt;
aEvt.Source = xSource;
// inform all listeners to release this object
- // The listener container are automaticly cleared
+ // The listener container are automatically cleared
rBHelper.aLC.disposeAndClear( aEvt );
// notify subclasses to do their dispose
disposing();
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 4157213..37610f9 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -344,7 +344,7 @@ void OPropertySetHelper::removePropertyChangeListener(
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
- // all listeners are automaticly released in a dispose call
+ // all listeners are automatically released in a dispose call
if( !rBHelper.bInDispose && !rBHelper.bDisposed )
{
if( !rPropertyName.isEmpty() )
@@ -424,7 +424,7 @@ void OPropertySetHelper::removeVetoableChangeListener(
{
MutexGuard aGuard( rBHelper.rMutex );
OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
- // all listeners are automaticly released in a dispose call
+ // all listeners are automatically released in a dispose call
if( !rBHelper.bInDispose && !rBHelper.bDisposed )
{
if( !rPropertyName.isEmpty() )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index bf25c26..d9e0c64 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2083,7 +2083,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
pLastPortion->GetSize().Width()++;
// Correct positions in array
- // Even for kashidas just change positions, VCL will then draw the kashida automaticly
+ // Even for kashidas just change positions, VCL will then draw the kashida automatically
sal_Int32 nPortionEnd = nPortionStart + pLastPortion->GetLen();
for ( sal_Int32 _n = nChar; _n < nPortionEnd; _n++ )
{
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 7aaf40a..bc0073b 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -235,7 +235,7 @@ void SAL_CALL BaseContainer::removeByName(const OUString& sItem)
impl_initFlushMode();
FilterCache* pCache = impl_getWorkingCache();
- pCache->removeItem(m_eType, sItem); // throw exceptions automaticly
+ pCache->removeItem(m_eType, sItem); // throw exceptions automatically
aLock.clear();
// <- SAFE ----------------------------------
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 050b9a1..1f914d8 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -92,7 +92,7 @@ class BaseContainer : public BaseLock
m_pFlushCache and m_rCache must not be synchronized manually here.
m_rCache listen on the global configuration, where m_pFlushCache
- write its data. m_rCache update itself automaticly.
+ write its data. m_rCache update itself automatically.
*/
FilterCache* m_pFlushCache;
@@ -168,7 +168,7 @@ class BaseContainer : public BaseLock
/** @short check if the underlying configuration data was already loaded
- and do it if necessary automaticly.
+ and do it if necessary automatically.
*/
void impl_loadOnDemand();
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 7788d10..39e556c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -368,7 +368,7 @@ CacheItem FilterCache::getItem( EItemType eType,
{
// ... or load it on demand from the
// underlying configuration layer.
- // Note: NoSuchElementException is thrown automaticly here if
+ // Note: NoSuchElementException is thrown automatically here if
// item could not be loaded!
pIt = impl_loadItemOnDemand(eType, sItem);
}
@@ -547,8 +547,8 @@ void FilterCache::addStatePropsToItem( EItemType eType,
May by the following reason exists:
- The item does not exists inside the new configuration package org.openoffice.TypeDetection - but
we got it from the old package org.openoffice.Office/TypeDetection. We dont migrate such items
- automaticly to the new format. Because it will disturb e.g. the deinstallation of an external filter
- package. Because such external filter can remove the old file - but not the automaticly created new one ...
+ automatically to the new format. Because it will disturb e.g. the deinstallation of an external filter
+ package. Because such external filter can remove the old file - but not the automatically created new one ...
=> mark item as FINALIZED / MANDATORY, we dont support writing to the old format
*/
@@ -1322,7 +1322,7 @@ void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList
throw(css::uno::Exception)
{
CacheItem& rItem = (*pList)[sItem];
- // In case it's a new created entry (automaticly done by the boost::unordered_map index operator!)
+ // In case it's a new created entry (automatically done by the boost::unordered_map index operator!)
// we must be sure, that this entry has its own name as property available.
// Its needed later at our container interface!
rItem[PROPNAME_NAME] <<= sItem;
@@ -1354,7 +1354,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
)
{
// Attention! If config couldnt be opened successfully
- // and exception os thrown automaticly and must be forwarded
+ // and exception os thrown automatically and must be forwarded
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
@@ -1371,7 +1371,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
)
{
// Attention! If config couldnt be opened successfully
- // and exception os thrown automaticly and must be forwarded
+ // and exception os thrown automatically and must be forwarded
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
@@ -1388,7 +1388,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
)
{
// Attention! If config couldnt be opened successfully
- // and exception os thrown automaticly and must be forwarded
+ // and exception os thrown automatically and must be forwarded
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
{
@@ -1405,7 +1405,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
)
{
// Attention! If config couldnt be opened successfully
- // and exception os thrown automaticly and must be forwarded
+ // and exception os thrown automatically and must be forwarded
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
@@ -1422,7 +1422,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
)
{
// Attention! If config couldnt be opened successfully
- // and exception os thrown automaticly and must be forwarded
+ // and exception os thrown automatically and must be forwarded
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 05cbfe2..3302612 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -288,7 +288,7 @@ class FilterCache : public BaseLock
After its changed data was flushed to the configuration it can be
removed.
- The original container will get these new data automaticly
+ The original container will get these new data automatically
because it listen for changes on the internal used configuration layer.
If the new data are needed immediately inside the original container,
the method takeOver() can be used to copy all changes back.
@@ -566,7 +566,7 @@ class FilterCache : public BaseLock
if an internal error occurred.
Note: If the item is missing inside the underlying configuration
no exception will be thrown. In such case the item is marked as
- finalized/mandatory automaticly
+ finalized/mandatory automatically
Reason: May be the item cames from the old configuration package and
was not migrated to the new one. So we can't provide write access
to such items ...
@@ -742,8 +742,8 @@ class FilterCache : public BaseLock
/** @short validate the whole cache and create
structures for optimized items access.
- @descr Wrong cache items will be removed automaticly.
- Wrong dependencies will be corrected automaticly.
+ @descr Wrong cache items will be removed automatically.
+ Wrong dependencies will be corrected automatically.
If something could not be repaired - an exception
is thrown.
Further some optmized structures will be created.
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index c537282..d5b7df6 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -96,7 +96,7 @@ namespace svt
void SmartContent::enableDefaultInteractionHandler()
{
// Don't free the memory here! It will be done by the next
- // call automaticly - releasing of the uno reference ...
+ // call automatically - releasing of the uno reference ...
m_pOwnInteraction = NULL;
m_xOwnInteraction.clear();
@@ -130,7 +130,7 @@ namespace svt
void SmartContent::disableInteractionHandler()
{
// Don't free the memory here! It will be done by the next
- // call automaticly - releasing of the uno reference ...
+ // call automatically - releasing of the uno reference ...
m_pOwnInteraction = NULL;
m_xOwnInteraction.clear();
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 9e8ee04..80f7515 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -244,7 +244,7 @@ CFilePreview::CFilePreview(
wndClsEx.lpszClassName = PREVIEWWND_CLASS_NAME;
// register the preview window class
- // !!! Win95 - the window class will be unregistered automaticly
+ // !!! Win95 - the window class will be unregistered automatically
// if the dll is unloaded
// Win2000 - the window class must be unregistered manually
// if the dll is unloaded
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 708680c..b8023a8 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -396,7 +396,7 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass()
wndClsEx.lpszClassName = PREVIEWWND_CLASS_NAME;
// register the preview window class
- // !!! Win95 - the window class will be unregistered automaticly
+ // !!! Win95 - the window class will be unregistered automatically
// if the dll is unloaded
// Win2000 - the window class must be unregistered manually
// if the dll is unloaded
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index cb11f28..237433a 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -545,7 +545,7 @@ ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( )
wndClsEx.lpszClassName = HELPPOPUPWND_CLASS_NAME;
// register the preview window class
- // !!! Win95 - the window class will be unregistered automaticly
+ // !!! Win95 - the window class will be unregistered automatically
// if the dll is unloaded
// Win2000 - the window class must be unregistered manually
// if the dll is unloaded
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 6708edc..009a1b8 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -67,7 +67,7 @@ class CheckedIterator
/*-****************************************************************************************************
@short initialize instance with valid container
- @descr Set new container at an instance of this class. The other member will set automaticly!
+ @descr Set new container at an instance of this class. The other member will set automatically!
m_pPosition = first element in container
m_eEndState = BEFOREEND
@param "rContainer", must be a valid reference to an existing container.
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 40539bd..b942566 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -82,7 +82,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash;
- another one maps her registered pattern to her uno names to
perform search on such data
But this lists a static for all instances of this class. So it's possible to
- create new objects without opening configuration twice and free memory automaticly
+ create new objects without opening configuration twice and free memory automatically
if last object will gone.
@attention We implement a singleton concept - so we don't need any mutex member here.
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 5ab7a8b..189e109 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -42,7 +42,7 @@ namespace framework{
/**
@short protocol handler for "mailto:" URLs
@descr It's a special dispatch object which is used registered for "mailto:*" URLs and
- will be automaticly used from the framework dispatch mechanism if such URL occurred.
+ will be automatically used from the framework dispatch mechanism if such URL occurred.
@base OWeakObject
provides XWeak and ref count mechanism
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 977c385..92bde6d 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -92,7 +92,7 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
/*-****************************************************************************************************
@short dispatch URL with arguments
- @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly!
+ @descr Every dispatch create a new task. If load of URL failed task will deleted automatically!
@param "aURL" , URL to dispatch.
@param "seqArguments" , list of optional arguments.
*//*-*****************************************************************************************************/
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 53212f3..e84049a 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -42,7 +42,7 @@ namespace framework{
/**
@short protocol handler for "service:*" URLs
@descr It's a special dispatch/provider object which is registered for such URL pattern and will
- be automaticly used by the framework dispatch mechanism if such URL occurred.
+ be automatically used by the framework dispatch mechanism if such URL occurred.
His job is to create any registered uno components which must be coded inside
dispatched URL (may with some optional given parameters). After that such created
service must be hold his self alive. Such mechanism can be useful for UI components
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 28a3220..b4517e9 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -42,7 +42,7 @@ namespace framework{
/**
@short protocol handler for "systemexec:*" URLs
@descr It's a special dispatch/provider object which is registered for such URL pattern and will
- be automaticly used by the framework dispatch mechanism if such URL occurred.
+ be automatically used by the framework dispatch mechanism if such URL occurred.
It forwards all URL's to the underlying operating system.
So it would e.g. be possible to open HTML files outside the office within a web browser.
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index fd509d3..91e56b9 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -255,7 +255,7 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4<
/** @short show the parent window of this progress ...
if it's allowed to do so.
- @descr By default we show the parent window automaticly
+ @descr By default we show the parent window automatically
if this progress is used.
If that isn't a valid operation, the user of this
progress can suppress this feature by initializaing
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 81d8256..0a4ddb1 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -146,7 +146,7 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
bool its_isHelpUrlADefaultOne(const OUString& sHelpURL);
- /** @short checks, if the help module should be shown automaticly for the
+ /** @short checks, if the help module should be shown automatically for the
currently opened office module.
@descr This value is readed from the module configuration.
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 1aa3dd1..498c877 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -268,8 +268,8 @@ ________________________________________________________________________________
// implementation of XTypeProvider
// implementation of XTypeProvider without additional interface for getTypes()
-// XTypeProvider is used as the only one interface automaticly.
-// Following defines don't use XTypeProvider automaticly!!!!
+// XTypeProvider is used as the only one interface automatically.
+// Following defines don't use XTypeProvider automatically!!!!
#define DEFINE_XTYPEPROVIDER_0( CLASS ) \
PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS )
diff --git a/framework/inc/taskcreatordefs.hxx b/framework/inc/taskcreatordefs.hxx
index 7da0772..b0044d9 100644
--- a/framework/inc/taskcreatordefs.hxx
+++ b/framework/inc/taskcreatordefs.hxx
@@ -48,7 +48,7 @@ const char ARGUMENT_CONTAINERWINDOW[] = "ContainerWindow"; // XWindow
const char ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE[] = "SupportPersistentWindowState"; // sal_Bool
/** [sal_Bool] enable/disable special mode, where the title bar of our
- the new created frame will be updated automaticly.
+ the new created frame will be updated automatically.
Default = ON !
*/
const char ARGUMENT_ENABLE_TITLEBARUPDATE[] = "EnableTitleBarUpdate"; // sal_Bool
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index b3cc6cd..04c6ce7 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -113,7 +113,7 @@ class Gate : public IGate
@short open gate for current waiting threads
@descr All current waiting threads stand in wait() at line "m_aPassage.wait()" ...
With this call you can open the passage for these waiting ones.
- The "gap" is closed by any new thread which call wait() automaticly!
+ The "gap" is closed by any new thread which call wait() automatically!
@seealso method wait()
@seealso method open()
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 6e2b013..baffdb4 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -97,7 +97,7 @@ enum EExceptionMode
/*-************************************************************************************************************
@descr How can you use the transaction manager?
Use it in combination with an TransactionGuard, which register your transaction in ctor
- and release in dtor automaticly! Follow interface class can be used to make using
+ and release in dtor automatically! Follow interface class can be used to make using
of different manager implmentations possible by using same guard.
*//*-*************************************************************************************************************/
class ITransactionManager
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 2160271..3690adc 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -30,9 +30,9 @@ namespace framework{
@descr If you wish to support non breakable method calls without lockingf any mutex, rw-lock or
something like that - you should use this guard implementation.
Initialize it at first in your method and don't release it till end of your function!
- Your "transaction" is registered in ctor and automaticly released in dtor.
+ Your "transaction" is registered in ctor and automatically released in dtor.
Use set/get of working mode to enable/disable further transactions.
- It's possible too, to enable automaticly throwing of some exceptions for illegal
+ It's possible too, to enable automatically throwing of some exceptions for illegal
transaction requests ... e.g. interface call for already disposed objects.
@attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private!
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index e003f5e..4387948 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -40,7 +40,7 @@ namespace framework{
synchronization like e.g. mutex, rw-lock!
That protect your code against wrong calls at wrong time ... e.g. calls after disposing an object!
Use combination of EExceptionMode and ERejectReason to detect rejected requests
- and react for it. You can enable automaticly throwing of exceptions too.
+ and react for it. You can enable automatically throwing of exceptions too.
@implements ITransactionManager
@base ITransactionManager
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index c464980..7ff945c 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -278,7 +278,7 @@ public class checkdispatchapi
if (bIsRegistered)
{
- fail("Interceptor was not deregistered automaticly on closing the corresponding frame.");
+ fail("Interceptor was not deregistered automatically on closing the corresponding frame.");
}
System.out.println("Destruction of interception chain works as designed .-)");
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 1fe7876..ad1a63c 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -34,7 +34,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
/**
* @const SHOWSTATUS_NO don't show the status - but save information about using of this indicator object
- * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automaticly too)
+ * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automatically too)
* @const SHOWSTATUS_DIALOG the status will be shown inside a java dialog
* @const SHOWSTATUS_LINK the status will be notified to interested listener (one listener only!)
*/
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 5e0a032..301667b 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -42,7 +42,7 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
AcceleratorCache::~AcceleratorCache()
{
- // Dont save anything automaticly here.
+ // Dont save anything automatically here.
// The user has to do that explicitly!
}
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 5c138c8..9a5cf70 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -447,7 +447,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c
css::uno::Reference< css::io::XTruncate > xClearable(xStream, css::uno::UNO_QUERY_THROW);
xClearable->truncate();
- // TODO can be removed if seek(0) is done by truncate() automaticly!
+ // TODO can be removed if seek(0) is done by truncate() automatically!
css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY);
if (xSeek.is())
xSeek->seek(0);
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 350c479..3abc72b 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -47,7 +47,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
SolarMutexClearableGuard aReadLock;
// a) first search an interceptor, which match to this URL by its URL pattern registration
- // Note: if it return NULL - it does not mean an empty interceptor list automaticly!
+ // Note: if it return NULL - it does not mean an empty interceptor list automatically!
css::uno::Reference< css::frame::XDispatchProvider > xInterceptor;
InterceptorList::const_iterator pIt = m_lInterceptionRegs.findByPattern(aURL.Complete);
if (pIt != m_lInterceptionRegs.end())
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 25e1973..80e825f 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -73,7 +73,7 @@ HandlerCFGAccess* HandlerCache::m_pConfig = NULL;
/**
@short ctor of the cache of all registered protoco handler
- @descr It tries to open the right configuration package automaticly
+ @descr It tries to open the right configuration package automatically
and fill the internal structures. After that the cache can be
used for read access on this data and perform some search
operations on it.
@@ -170,7 +170,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern)
/**
@short dtor of the config access class
- @descr It opens the configuration package automaticly by using base class mechanism.
+ @descr It opens the configuration package automatically by using base class mechanism.
After that "read()" method of this class should be called to use it.
@param sPackage
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index bb65ec7..c7724e8 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -285,7 +285,7 @@ class PresetHandler
and we use e.g. "/en-US/default.xml" internally.
If no localization exists for this preset set, this class
- will work in default mode - means "no locale" - automaticly.
+ will work in default mode - means "no locale" - automatically.
e.g. "/default.xml"
@throw com::sun::star::uno::RuntimeException(!)
@@ -342,7 +342,7 @@ class PresetHandler
@descr Note: Targets resist inside the user
layer. Normaly they are opened in read/write mode.
- But it will be opened readonly automaticly if that isnt possible
+ But it will be opened readonly automatically if that isnt possible
(may be the file is write protected on the system ...).
@param sTarget
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 2166c54..7822afb 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -412,7 +412,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c
@descr Note: Some results can be handled only, if this job has a valid configuration!
For "not configured jobs" (means pure services) they can be ignored.
But these cases are handled by our JobData member. We can call it everytime.
- It does the right things automaticly. E.g. if the job has no configuration ...
+ It does the right things automatically. E.g. if the job has no configuration ...
it does nothing during setJobConfig()!
@param aResult
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 0e96805..e208e8f 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -183,7 +183,7 @@ void JobData::setService( const OUString& sService )
/**
@short initialize this instance with new job values.
- @descr It reads automaticly all properties of the specified
+ @descr It reads automatically all properties of the specified
job (using it's alias name) and "register it" for the
given event. This registration will not be validated against
the underlying configuration! (That must be done from outside.
@@ -233,7 +233,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
if (m_eMode==E_ALIAS)
{
// It doesn't matter if this config object was already opened before.
- // It doesn nothing here then ... or it change the mode automaticly, if
+ // It doesn nothing here then ... or it change the mode automatically, if
// it was opened using another one before.
ConfigAccess aConfig(
m_xContext,
@@ -417,7 +417,7 @@ void JobData::disableJob()
// update the configuration
// It doesn't matter if this config object was already opened before.
- // It doesn nothing here then ... or it change the mode automaticly, if
+ // It doesn nothing here then ... or it change the mode automatically, if
// it was opened using another one before.
ConfigAccess aConfig(
m_xContext,
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 2182159..d4a6deb 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -916,7 +916,7 @@ void LayoutManager::implts_backupProgressBarWrapper()
return;
// safe a backup copy of the current progress!
- // This copy will be used automaticly inside createProgressBar() which is called
+ // This copy will be used automatically inside createProgressBar() which is called
// implictly from implts_doLayout() .-)
m_xProgressBarBackup = m_aProgressBarElement.m_xUIElement;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 879d0d1..7352ede 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -136,7 +136,7 @@ void Desktop::constructorInit()
@attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you
will get over this. (e.g. using of your reference as parameter to initialize some member)
- Do such things in DEFINE_INIT_SERVICE() method, which is called automaticly after your ctor!!!
+ Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!!
b) Baseclass OBroadcastHelper is a typedef in namespace cppu!
The microsoft compiler has some problems to handle it right BY using namespace explicitly ::cppu::OBroadcastHelper.
If we write it without a namespace or expand the typedef to OBrodcastHelperVar<...> -> it will be OK!?
@@ -914,7 +914,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
// I.I) "_blank"
// create a new task as child of this desktop instance
- // Note: Used helper TaskCreator use us automaticly ...
+ // Note: Used helper TaskCreator use us automatically ...
if ( sTargetFrameName==SPECIALTARGET_BLANK )
{
@@ -995,7 +995,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
// II.IV) CREATE
// If we haven't found any valid target frame by using normal flags - but user allowed us to create
- // a new one ... we should do that. Used TaskCreator use us automaticly as parent!
+ // a new one ... we should do that. Used TaskCreator use us automatically as parent!
if (
( ! xTarget.is() ) &&
@@ -1360,7 +1360,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon
@descr This method is calling from helperclass "OPropertySetHelper".
Don't use this directly!
Handle and value are valid everyway! You must set the new value only.
- After this, baseclass send messages to all listener automaticly.
+ After this, baseclass send messages to all listener automatically.
@seealso class OPropertySetHelper
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0fdb80d..bbbfd2d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -477,7 +477,7 @@ DEFINE_XTYPEPROVIDER_21 ( Frame
@attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you
will get over this. (e.g. using of your reference as parameter to initialize some member)
- Do such things in DEFINE_INIT_SERVICE() method, which is called automaticly after your ctor!!!
+ Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!!
b) Baseclass OBroadcastHelper is a typedef in namespace cppu!
The microsoft compiler has some problems to handle it right BY using namespace explicitly ::cppu::OBroadcastHelper.
If we write it without a namespace or expand the typedef to OBrodcastHelperVar<...> -> it will be OK!?
@@ -1030,7 +1030,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
// I.I) "_blank"
// Not allowed for a normal frame - but for the desktop.
- // Use helper class to do so. It use the desktop automaticly.
+ // Use helper class to do so. It use the desktop automatically.
if ( sTargetFrameName==SPECIALTARGET_BLANK )
{
@@ -1224,7 +1224,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
// II.IV) CREATE
// If we haven't found any valid target frame by using normal flags - but user allowed us to create
- // a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent!
+ // a new one ... we should do that. Used TaskCreator use Desktop instance automatically as parent!
if (
( ! xTarget.is() ) &&
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 578622b..6d3195b 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -293,7 +293,7 @@ css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFram
xNewFrame->initialize( xContainerWindow );
// Put frame to the frame tree.
- // Note: The property creator/parent will be set on the new putted frame automaticly ... by the parent container.
+ // Note: The property creator/parent will be set on the new putted frame automatically ... by the parent container.
if (xParentFrame.is())
{
css::uno::Reference< css::frame::XFramesSupplier > xSupplier (xParentFrame, css::uno::UNO_QUERY_THROW);
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index b1825c8..7d7e3bf 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -134,7 +134,7 @@ namespace dbtools
*/
bool shouldEscapeDateTime() const;
- /** auto increment columns should be automaticly used as primary key.
+ /** auto increment columns should be automatically used as primary key.
*/
bool isAutoIncrementPrimaryKey() const;
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 0d44f17..ec294f8 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -246,7 +246,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@descr This base implementation checks, if the request could be intercepted
successfully. Then this method intercepted() is called.
The default implementation returns "NOT_INTERCEPTED" every time.
- So the method impl_interceptRequest() uses the right continuation automaticly.
+ So the method impl_interceptRequest() uses the right continuation automatically.
If this method was overwritten and something different "NO_INTERCEPTED"
is returned, the method impl_interceptRequest() will return immediately with
@@ -266,7 +266,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@return The result of this operation.
Note: If E_NOT_INTERCEPTED is returned the default handling of the base class
- will be used automaticly for this request!
+ will be used automatically for this request!
*/
virtual EInterceptionState intercepted(const InterceptedRequest& rRequest ,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest);
@@ -282,13 +282,13 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@descr If no further class is derived from this one
-> the default implementation is used. Then the
internal list of requests is used to handle different
- interactions automaticly.
+ interactions automatically.
(see impl_interceptRequest())
If this method was overwritten by a derived implementation
-> the new implementation has to do everything by itself.
Of course it can access all members/helpers and work with it.
- But the default implementation isnt used automaticly then.
+ But the default implementation isnt used automatically then.
@param xRequest
the interaction request, which should be intercepted.
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 6d8bd8c..165b988 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -62,7 +62,7 @@ public:
/** Get max size of specified history.
Call this methods to get information about max. size of specified list.
- If a new one is add to it the oldest one is deleted automaticly.
+ If a new one is add to it the oldest one is deleted automatically.
@param eHistory select right history.
@return Current max size of specified list.
@@ -85,7 +85,7 @@ public:
/** Append a new item to specified list
You can append items to a list only - removing isn't allowed for a special item.
- The oldest entry is deleted automaticly if max size arrived or you can call Clear() ...
+ The oldest entry is deleted automatically if max size arrived or you can call Clear() ...
It exist two different overload methods to do this.
One for user which have an complete history item and another one for uncompletly data sets!
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index 320e93f..c00f3a9 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -118,7 +118,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
It creates a seekable stream and put it into the descriptor.
- A might existing InteractionHandler will be used automaticly,
+ A might existing InteractionHandler will be used automatically,
to solve problems!
In case of local file the system file locking is used.
@@ -135,7 +135,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
It creates a seekable stream and put it into the descriptor.
- A might existing InteractionHandler will be used automaticly,
+ A might existing InteractionHandler will be used automatically,
to solve problems!
In case of local file the system file locking is used based on
@@ -316,7 +316,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
to open the stream (as e.g. URL, ReadOnly, PostData etcpp.).
It creates a seekable stream and put it into the descriptor.
- A might existing InteractionHandler will be used automaticly,
+ A might existing InteractionHandler will be used automatically,
to solve problems!
@param bLockFile
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index aece9ca..109cd37 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -135,7 +135,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op
/*-****************************************************************************************************
@short use it to get information about existing entries in configuration
- @descr The methods to set/get the position or size will create a new entry automaticly if
+ @descr The methods to set/get the position or size will create a new entry automatically if
it not already exist and work with default values!
If this a problem for you - you MUST call these method before and
you must make up your own mind about that.
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 66b3422..9a3ec8e 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -271,7 +271,7 @@ public:
/** initializes some internal structures for fast access to the given XShapes collection
<p>This method has to be called before you use exportShape or collectShapeAutoStyles.
- It is automaticly called if you use collectShapesAutoStyles and exportShapes.
+ It is automatically called if you use collectShapesAutoStyles and exportShapes.
@see collectShapeAutoStyles
@see exportShape
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 04c33b6..9469958 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -398,7 +398,7 @@ XMultiPropertySet
//XPropertySet ----------------------------------------------------
synchronized public void removePropertyChangeListener(String propName, XPropertyChangeListener listener) throws UnknownPropertyException, WrappedTargetException
- { // all listeners are automaticly released in a dispose call
+ { // all listeners are automatically released in a dispose call
if (!bInDispose && !bDisposed)
{
if (propName.length() > 0)
@@ -415,7 +415,7 @@ XMultiPropertySet
//XPropertySet ----------------------------------------------------
synchronized public void removeVetoableChangeListener(String propName, XVetoableChangeListener listener) throws UnknownPropertyException, WrappedTargetException
- {// all listeners are automaticly released in a dispose call
+ {// all listeners are automatically released in a dispose call
if (!bInDispose && !bDisposed)
{
if (propName.length() > 0)
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
index 769768b..a3576b0 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
@@ -150,7 +150,7 @@ public class CustomizeView extends JPanel
// be frame action listener
// The callback will update listener connections
- // for status updates automaticly!
+ // for status updates automatically!
m_aMenuBarListener = new StatusListener(m_cbMenuBar ,MENUBAR_ON ,MENUBAR_OFF ,xFrame, FEATUREURL_MENUBAR );
m_aToolBarListener = new StatusListener(m_cbToolBar ,TOOLBAR_ON ,TOOLBAR_OFF ,xFrame, FEATUREURL_TOOLBAR );
m_aObjectBarListener = new StatusListener(m_cbObjectBar,OBJECTBAR_ON,OBJECTBAR_OFF,xFrame, FEATUREURL_OBJECTBAR);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
index 6553b3b..101540e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java
@@ -83,7 +83,7 @@ public class Desk
// Create first document view.
// This one will register himself at the global
// ViewContainer. Further views will be open
- // automaticly started from this first one.
+ // automatically started from this first one.
DocumentView aView = new DocumentView();
aView.setVisible(true);
aView.createFrame();
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 5cde458..a8106c0 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -341,7 +341,7 @@ public class DocumentView extends JFrame
// close the frame and his document
// Relaesing of our listener connections for disposing()
- // will be forced automaticly then. Because the frame
+ // will be forced automatically then. Because the frame
// will call us back ...
if (mxFrame!=null)
FunctionHelper.closeFrame(mxFrame);
@@ -360,7 +360,7 @@ public class DocumentView extends JFrame
/**
* callback from our internal saved frame
* which wish to die. Its not necessary to remove listener connections
- * here. Because the broadcaster do it automaticly.
+ * here. Because the broadcaster do it automatically.
* We have to release all references to him only.
*
* @param aSource
@@ -418,7 +418,7 @@ public class DocumentView extends JFrame
if( sCommand.compareTo(COMMAND_EXIT) == 0 )
{
// This will force deleting of this and
- // all other currently opened views automaticly!
+ // all other currently opened views automatically!
System.exit(0);
}
}
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 2eced06..0e3851b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -307,7 +307,7 @@ public class FunctionHelper
// the systemw window handle. A possible reason can be an invisible
// java window. In this case it should be enough to set return
// values to null. All other resources (which was created before)
- // will be freed automaticly if scope wil be leaved.
+ // will be freed automatically if scope wil be leaved.
System.out.println("May be the NativeView object wasn't really visible at calling time of getNativeWindow()?");
xPeer = null;
xWindow = null;
@@ -389,7 +389,7 @@ public class FunctionHelper
if(xFrame!=null)
{
// Try to dispose the frame. He should deregister himself at the desktop object
- // and free all internal used resources (e.g. the container window) automaticly.
+ // and free all internal used resources (e.g. the container window) automatically.
// It's possible to do that here - because frame has no component inside yet.
// So nobody can disagree with that.
// After the dispose() call forget all references to this frame and let him die.
@@ -437,7 +437,7 @@ public class FunctionHelper
* @param xFrame frame which should be the target of this dispatch
* @param aURL full parsed and converted office URL for dispatch
* @param lProperties optional arguments for dispatch
- * @param xListener optional listener which is registered automaticly for status events
+ * @param xListener optional listener which is registered automatically for status events
* (Note: Deregistration is part of this listener himself!)
*
* @return [XDispatch] It's the used dispatch object and can be used for deregistration of an optional listener.
@@ -500,8 +500,8 @@ public class FunctionHelper
* @param xFrame frame which should be the target of this dispatch
* @param aURL full parsed and converted office URL for dispatch
* @param lProperties optional arguments for dispatch
- * @param xListener optional listener which is registered automaticly for status events
- * (Note: Deregistration is not supported. Dispatcher does it automaticly.)
+ * @param xListener optional listener which is registered automatically for status events
+ * (Note: Deregistration is not supported. Dispatcher does it automatically.)
*/
public static void executeWithNotification(com.sun.star.frame.XFrame xFrame ,
com.sun.star.util.URL aURL ,
@@ -681,7 +681,7 @@ public class FunctionHelper
* It try to export given document in HTML format.
* Current document will be converted to HTML and moved to new place on disk.
* A "new" file will be created by given URL (may be overwritten
- * if it already exist). Right filter will be used automaticly if factory of
+ * if it already exist). Right filter will be used automatically if factory of
* this document support it. If no valid filter can be found for export,
* nothing will be done here.
*
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
index c8e300e..0851469 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
@@ -94,7 +94,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
/**
* ctor
* Initialize the new interceptor. Given frame reference can be used to
- * register this interceptor on it automaticly later.
+ * register this interceptor on it automatically later.
*
* @seealso startListening()
*
@@ -555,7 +555,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
/**
* Implements (optional!) optimization for interceptor mechanism.
- * Any interceptor which provides this special interface is called automaticly
+ * Any interceptor which provides this special interface is called automatically
* at registration time on this method. Returned URL's will be used to
* call this interceptor directly without calling his masters before, IF(!)
* following rules will be true:
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
index fb14f5a..8b1d4b7 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java
@@ -122,7 +122,7 @@ public class OfficeConnect
*
* @param aType describe class type of created service
* Returned object can be casted directly to this one.
- * Uno query was done by this method automaticly.
+ * Uno query was done by this method automatically.
* @param sServiceSpecifier name of service which should be created
* @return the new created service object
*/
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
index 6e65c83..d9bd18e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
@@ -54,7 +54,7 @@ import com.sun.star.uno.UnoRuntime;
*
* Further we are frame action listener too.
* So we can update our status listener connections and
- * internal holded dispatch object automaticly.
+ * internal holded dispatch object automatically.
*
* Another reason for such extra class for listening:
* Most listener callbacks are asynchronous [oneay] requests.
@@ -121,7 +121,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener,
* start working as frame action listener really.
* In case we get such frame action, it indicates that we should
* update our internal saved dispatch object on which we listen
- * for status events. So we can do it automaticly. The outside code
+ * for status events. So we can do it automatically. The outside code
* mustn't check such things. We can work with one frame,
* till it die. It doesn't matter if he will be used for different
* load/save or any other requests. We will be up to date everytime.
@@ -384,7 +384,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener,
* Our dispatch or frame object inform us about his following dead ...
* So we must forget his reference. But it's not necessary to
* remove listener connections here. Because the broadcaster
- * forget us automaticly. The only thing we have to do: release
+ * forget us automatically. The only thing we have to do: release
* his reference and let him die!
*
* @param aEvent
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
index 08616cfe..1b3289e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
@@ -209,7 +209,7 @@ public class StatusView extends JPanel
* And because the environment of the frame can be changed - these
* listener refresh himself internally for frame action events too.
* So we register it as such frame action listener only here.
- * Rest is done automaticly ...
+ * Rest is done automatically ...
*
* @param xFrame
* will be used as source of possible status events
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 8130362..511314d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -159,7 +159,7 @@ public class AsciiReplaceFilter
/**
* used for initializing after creation
* If an instance of this service is created by UNO we will be called
- * automaticly after that to get optional parameters of this creation call.
+ * automatically after that to get optional parameters of this creation call.
* E.g.: The service com.sun.star.document.FilterFactory use such mechanism
* to pass our own configuration data to this instance.
*
diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
index be5404a..6ccb776 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
@@ -103,7 +103,7 @@ public class OfficeConnect
*
* @param aType describe class type of created service
* Returned object can be casted directly to this one.
- * Uno query was done by this method automaticly.
+ * Uno query was done by this method automatically.
* @param sServiceSpecifier name of service which should be created
* @return Description of the Returned Value
*/
diff --git a/odk/examples/java/DocumentHandling/DocumentLoader.java b/odk/examples/java/DocumentHandling/DocumentLoader.java
index 2f01046..744b23c6 100644
--- a/odk/examples/java/DocumentHandling/DocumentLoader.java
+++ b/odk/examples/java/DocumentHandling/DocumentLoader.java
@@ -74,7 +74,7 @@ public class DocumentLoader {
sUrl = sbTmp.toString();
}
- // Load a Writer document, which will be automaticly displayed
+ // Load a Writer document, which will be automatically displayed
com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL(
sUrl, "_blank", 0, new com.sun.star.beans.PropertyValue[0]);
diff --git a/odk/examples/java/DocumentHandling/DocumentPrinter.java b/odk/examples/java/DocumentHandling/DocumentPrinter.java
index cc85112..b94d700 100644
--- a/odk/examples/java/DocumentHandling/DocumentPrinter.java
+++ b/odk/examples/java/DocumentHandling/DocumentPrinter.java
@@ -68,7 +68,7 @@ public class DocumentPrinter {
StringBuffer sUrl = new StringBuffer("file:///");
sUrl.append(sourceFile.getCanonicalPath().replace('\\', '/'));
- // Load a Writer document, which will be automaticly displayed
+ // Load a Writer document, which will be automatically displayed
com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL(
sUrl.toString(), "_blank", 0,
new com.sun.star.beans.PropertyValue[0] );
diff --git a/odk/examples/java/Inspector/TestInspector.java b/odk/examples/java/Inspector/TestInspector.java
index bd7a38e..804ad75 100644
--- a/odk/examples/java/Inspector/TestInspector.java
+++ b/odk/examples/java/Inspector/TestInspector.java
@@ -71,7 +71,7 @@ public class TestInspector {
com.sun.star.frame.XComponentLoader xCmpLoader = UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class,
xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext));
- // Load a new spreadsheet document, which will be automaticly
+ // Load a new spreadsheet document, which will be automatically
// displayed and is used for inspection
com.sun.star.lang.XComponent xComp = xCmpLoader.loadComponentFromURL("private:factory/scalc", "_blank", 0, new com.sun.star.beans.PropertyValue[0] );
xInstInspector.inspect(xCmpLoader, "");
diff --git a/odk/examples/java/NotesAccess/NotesAccess.java b/odk/examples/java/NotesAccess/NotesAccess.java
index a8b221e..70861a8 100644
--- a/odk/examples/java/NotesAccess/NotesAccess.java
+++ b/odk/examples/java/NotesAccess/NotesAccess.java
@@ -151,7 +151,7 @@ public class NotesAccess implements Runnable {
xMCF.createInstanceWithContext(
"com.sun.star.frame.Desktop", xContext));
- // Load a Writer document, which will be automaticly displayed
+ // Load a Writer document, which will be automatically displayed
XComponent xComponent = xLoader.loadComponentFromURL(
"private:factory/scalc", "_blank", 0,
new PropertyValue[0] );
diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java
index 9638fd0..f85c500 100644
--- a/odk/examples/java/Spreadsheet/ChartTypeChange.java
+++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java
@@ -183,7 +183,7 @@ public class ChartTypeChange {
xMCF.createInstanceWithContext("com.sun.star.frame.Desktop",
xCompContext ) );
- // Load a Writer document, which will be automaticly displayed
+ // Load a Writer document, which will be automatically displayed
XComponent xComponent = xComponentloader.loadComponentFromURL(
"file:///" + stringFileName, "_blank", 0,
new PropertyValue[0] );
@@ -226,7 +226,7 @@ public class ChartTypeChange {
"com.sun.star.frame.Desktop",
xCompContext ) );
- // Create an empty calc document, which will be automaticly displayed
+ // Create an empty calc document, which will be automatically displayed
XComponent xComponent = xcomponentloader.loadComponentFromURL(
"private:factory/scalc", "_blank", 0,
new PropertyValue[0] );
diff --git a/odk/examples/java/Text/GraphicsInserter.java b/odk/examples/java/Text/GraphicsInserter.java
index d2078f7..0bcdcfa 100644
--- a/odk/examples/java/Text/GraphicsInserter.java
+++ b/odk/examples/java/Text/GraphicsInserter.java
@@ -76,7 +76,7 @@ public class GraphicsInserter {
UnoRuntime.queryInterface(
com.sun.star.frame.XComponentLoader.class, xDesktop);
- // Load a Writer document, which will be automaticly displayed
+ // Load a Writer document, which will be automatically displayed
com.sun.star.lang.XComponent xComp = xCompLoader.loadComponentFromURL(
"private:factory/swriter", "_blank", 0,
new com.sun.star.beans.PropertyValue[0]);
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index df2d38a..ee84cb4 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -269,7 +269,7 @@ private:
SdrObject* mpObj;
/** this stores the first object that is used for text conversion.
- Conversion automaticly wraps around the document and stops when it
+ Conversion automatically wraps around the document and stops when it
finds this object again.
*/
SdrObject* mpFirstObj;
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list