INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED
2008/07/30 11:15:22 rt 1.2.6.2: Update license header.
2008/03/20 11:56:28 jcn 1.2.6.1: Update from http://lilypond.org/~janneke/vc/toolkit.git/.git
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxwindow.cxx: Fix compile warning.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* util/makefile.mk: Revert obsolete VERSION addition.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* source/controls/dialogcontrol.cxx,
source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx,
util/defs/wntmsci11: Revert weird initial patch.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO: Doc update.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement
MoreButton. TODO: images.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* source/vclcompat/wbutton.cxx: Remove redraw cruft, rename
redrawAlready to redraw.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step
towards cleaner redraw.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/layout/helper.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.cxx,
workben/layout/recover.hxx: Extract AdvancedButton implementation
from recover.cxx into new widget.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Update recover dialog, make
advanced/simple switching work.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.cxx: In test mode, enable everything.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/localize.sdf: Manually add new translatable strings
and translations for de, nl.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor
and View layout alongside each other.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.cxx, workben/layout/zoom.hxx,
workben/layout/zoom.xml: Merge upstream's zoom.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx:
Nitpick, debugging aid.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement
FixedLine.IsEnabled().
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* util/makefile.mk: Build lib name fix.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Complete VBox/HBox wrappers. Not use
them in recover, spacing still wrong.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/recover.cxx,
workben/layout/recover.hxx, workben/layout/recover.xml: More
recovery dialog mockuping.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/box-base.cxx: Implement visibility of
elements/containers better.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/layout/import.cxx, source/layout/proplist.cxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx:
Implement FixedImage. Needed for recovery dialog.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/box-base.hxx, workben/layout/editor.cxx: Give
ChildData virtual distructor.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx,
util/makefile.mk, workben/layout/makefile.mk,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml, workben/layout/test.cxx: Stab at new
recover dialog.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/editor.cxx: Do not clear fresh container. Disable
debug printing.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for
wordcount.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix
ID for displaying dialogs.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/localize.sdf,
workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings
for all languages.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx,
source/layout/box-base.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/flow.cxx, source/layout/helper.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/root.cxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up
code duplication from layout: new Box_Base class implements
addChild, removeChild, getChildren, getChildProperties for Box,
Table, VCLXSplitter, VCLXTabControl.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/root.cxx: Document more fixmes.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/proplist.cxx: Remove m237
workaround.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/helper.cxx: More comment cleanups.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxtabcontrol.cxx, source/layout/box.cxx,
source/layout/container.cxx, source/vclcompat/wrapper.cxx:
Commented-out code cleanups.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, inc/layout/layoutcore.hxx,
source/awt/forward.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx,
source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx,
source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx,
source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx,
source/layout/bin.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/factory.hxx, source/layout/flow.cxx,
source/layout/flow.hxx, source/layout/helper.cxx,
source/layout/helper.hxx, source/layout/import.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/precompiled_xmlscript.hxx,
source/layout/proplist.cxx, source/layout/proplist.hxx,
source/layout/root.cxx, source/layout/root.hxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/layout/timer.hxx,
source/layout/translate.cxx, source/layout/translate.hxx,
source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx,
workben/layout/editor.cxx, workben/layout/editor.hxx,
workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx,
workben/layout/simple-paragraph.hxx, workben/layout/test.cxx,
workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence
headers.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/meekfile.mk: Junk meekfile.mk
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO: Update TODO.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize()
from VCLXWindow's switch to method.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize()
from VCLXWindow's switch to method.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxtopwindow.cxx: Remove code duplication from
VCLXDialog.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx:
Comment cleanup.
2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/helper.hxx,
workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix
remaining SUN warnings.
2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout.hxx, source/awt/vclxfixedline.hxx,
source/layout/byteseq.cxx, source/layout/helper.hxx,
source/layout/import.cxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/translate.hxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx,
source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some
sunstudio12 warnings.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/awt/makefile.mk,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx,
source/layout/helper.cxx: Junk VCLXProxy.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx,
inc/toolkit/helper/listenermultiplexer.hxx,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label
and images.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* .gitignore, source/awt/forward.hxx, source/awt/makefile.mk,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx,
source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx,
source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/makefile.mk, workben/layout/localize-de.sdf,
workben/layout/localize-nl.sdf: Cleanup of includes, namespace in
headers in awt.
2008-07-30 13:02:18 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
|
*
|
|
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
|
|
|
*
|
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
|
|
*
|
|
|
|
* $RCSfile: import.hxx,v $
|
|
|
|
*
|
|
|
|
* $Revision: 1.3 $
|
|
|
|
*
|
|
|
|
* This file is part of OpenOffice.org.
|
|
|
|
*
|
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
|
|
|
*
|
|
|
|
************************************************************************/
|
|
|
|
|
2008-03-06 10:48:47 +00:00
|
|
|
#ifndef IMPORT_HXX
|
|
|
|
#define IMPORT_HXX
|
|
|
|
|
|
|
|
#include <map>
|
|
|
|
#include <list>
|
|
|
|
#include <hash_map>
|
|
|
|
|
|
|
|
#include <com/sun/star/xml/input/XRoot.hpp>
|
|
|
|
#include <cppuhelper/implbase1.hxx>
|
|
|
|
|
|
|
|
namespace layoutimpl
|
|
|
|
{
|
|
|
|
class LayoutRoot;
|
|
|
|
class LayoutWidget;
|
|
|
|
namespace css = ::com::sun::star;
|
|
|
|
|
|
|
|
/* blocks under IMPORT_RADIOGROUP are marked for deletion.
|
|
|
|
The use of it is to synchronize radio buttons into groups.
|
|
|
|
But toolkit doesn't fire toggle events when toggled from the code.
|
|
|
|
Another approach is to implement our own XRadioButton from our
|
|
|
|
internal toolkit. We could have some singleton where they would
|
|
|
|
register... We would need to add another attribute...
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef IMPORT_RADIOGROUP
|
|
|
|
#include <com/sun/star/awt/XRadioButton.hpp>
|
|
|
|
class RadioGroups
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
RadioGroups()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void addItem( rtl::OUString id, css::uno::Reference< css::awt::XRadioButton > xRadio )
|
|
|
|
throw (css::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
if ( ! xRadio.is() )
|
|
|
|
throw css::uno::RuntimeException();
|
|
|
|
|
|
|
|
css::uno::Reference< RadioGroup > group;
|
|
|
|
RadioGroupsMap::iterator it = mxRadioGroups.find( id );
|
|
|
|
if ( it == mxRadioGroups.end() )
|
|
|
|
{
|
|
|
|
group = css::uno::Reference< RadioGroup > ( new RadioGroup() );
|
|
|
|
mxRadioGroups [id] = group;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
group = it->second;
|
|
|
|
group->addItem( xRadio );
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
class RadioGroup : public ::cppu::WeakImplHelper1< css::awt::XItemListener >
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
RadioGroup()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void addItem( css::uno::Reference< css::awt::XRadioButton > xRadio )
|
|
|
|
{
|
|
|
|
if ( ! mxSelectedRadio.is() )
|
|
|
|
{
|
|
|
|
xRadio->setState( true );
|
|
|
|
mxSelectedRadio = xRadio;
|
|
|
|
}
|
|
|
|
else if ( xRadio->getState() )
|
|
|
|
{
|
|
|
|
mxSelectedRadio->setState( false );
|
|
|
|
mxSelectedRadio = xRadio;
|
|
|
|
}
|
|
|
|
|
|
|
|
xRadio->addItemListener( this );
|
|
|
|
mxRadios.push_back (xRadio);
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
typedef std::list< css::uno::Reference< css::awt::XRadioButton > > RadioButtonsList;
|
|
|
|
RadioButtonsList mxRadios;
|
|
|
|
css::uno::Reference< css::awt::XRadioButton > mxSelectedRadio;
|
|
|
|
|
|
|
|
// awt::XItemListener
|
|
|
|
void itemStateChanged( const com::sun::star::awt::ItemEvent& e)
|
|
|
|
throw (css::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
if ( e.Selected )
|
|
|
|
{
|
|
|
|
mxSelectedRadio->setState( false );
|
|
|
|
// the only radio button selected would be the one that fired the event
|
INTEGRATION: CWS layoutdialogs (1.2.6); FILE MERGED
2008/07/30 11:15:22 rt 1.2.6.2: Update license header.
2008/03/20 11:56:28 jcn 1.2.6.1: Update from http://lilypond.org/~janneke/vc/toolkit.git/.git
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxwindow.cxx: Fix compile warning.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* util/makefile.mk: Revert obsolete VERSION addition.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* source/controls/dialogcontrol.cxx,
source/controls/unocontrol.cxx, source/helper/tkresmgr.cxx,
util/defs/wntmsci11: Revert weird initial patch.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO: Doc update.
2008-03-20 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.xml: Implement
MoreButton. TODO: images.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* source/vclcompat/wbutton.cxx: Remove redraw cruft, rename
redrawAlready to redraw.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, source/vclcompat/wbutton.cxx: Step
towards cleaner redraw.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/layout/helper.cxx,
source/vclcompat/wbutton.cxx, workben/layout/recover.cxx,
workben/layout/recover.hxx: Extract AdvancedButton implementation
from recover.cxx into new widget.
2008-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Update recover dialog, make
advanced/simple switching work.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.cxx: In test mode, enable everything.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/localize.sdf: Manually add new translatable strings
and translations for de, nl.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.xml: Update zoom to have hbox of Zoom factor
and View layout alongside each other.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/zoom.cxx, workben/layout/zoom.hxx,
workben/layout/zoom.xml: Merge upstream's zoom.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* source/vclcompat/wbutton.cxx, source/vclcompat/wrapper.hxx:
Nitpick, debugging aid.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout.hxx, source/vclcompat/wrapper.cxx: Implement
FixedLine.IsEnabled().
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* util/makefile.mk: Build lib name fix.
2008-03-14 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/vclcompat/wcontainer.cxx,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml: Complete VBox/HBox wrappers. Not use
them in recover, spacing still wrong.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/recover.cxx,
workben/layout/recover.hxx, workben/layout/recover.xml: More
recovery dialog mockuping.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/box-base.cxx: Implement visibility of
elements/containers better.
2008-03-13 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/layout/import.cxx, source/layout/proplist.cxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx:
Implement FixedImage. Needed for recovery dialog.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/box-base.hxx, workben/layout/editor.cxx: Give
ChildData virtual distructor.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, source/layout/helper.cxx,
source/vclcompat/makefile.mk, source/vclcompat/wrapper.cxx,
util/makefile.mk, workben/layout/makefile.mk,
workben/layout/recover.cxx, workben/layout/recover.hxx,
workben/layout/recover.xml, workben/layout/test.cxx: Stab at new
recover dialog.
2008-02-28 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/editor.cxx: Do not clear fresh container. Disable
debug printing.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/localize.sdf: Fix localize.sdf for
wordcount.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-pre.hxx, source/layout/dialogbuttonhbox.cxx: Fix
ID for displaying dialogs.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, workben/layout/localize.sdf,
workben/layout/wordcount.xml, workben/layout/zoom.xml: Add strings
for all languages.
2008-02-27 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/box-base.cxx,
source/layout/box-base.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/flow.cxx, source/layout/helper.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/root.cxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx: Clean-up
code duplication from layout: new Box_Base class implements
addChild, removeChild, getChildren, getChildProperties for Box,
Table, VCLXSplitter, VCLXTabControl.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/root.cxx: Document more fixmes.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/proplist.cxx: Remove m237
workaround.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/layout/helper.cxx: More comment cleanups.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxtabcontrol.cxx, source/layout/box.cxx,
source/layout/container.cxx, source/vclcompat/wrapper.cxx:
Commented-out code cleanups.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout-post.hxx, inc/layout/layout-pre.hxx,
inc/layout/layout.hxx, inc/layout/layoutcore.hxx,
source/awt/forward.hxx, source/awt/vclxbutton.cxx,
source/awt/vclxbutton.hxx, source/awt/vclxdialog.cxx,
source/awt/vclxdialog.hxx, source/awt/vclxfixedline.cxx,
source/awt/vclxfixedline.hxx, source/awt/vclxscroller.cxx,
source/awt/vclxscroller.hxx, source/awt/vclxsplitter.cxx,
source/awt/vclxsplitter.hxx, source/awt/vclxtabcontrol.cxx,
source/awt/vclxtabcontrol.hxx, source/layout/bin.cxx,
source/layout/bin.hxx, source/layout/box.cxx,
source/layout/box.hxx, source/layout/container.cxx,
source/layout/container.hxx, source/layout/dialogbuttonhbox.cxx,
source/layout/dialogbuttonhbox.hxx, source/layout/factory.cxx,
source/layout/factory.hxx, source/layout/flow.cxx,
source/layout/flow.hxx, source/layout/helper.cxx,
source/layout/helper.hxx, source/layout/import.cxx,
source/layout/import.hxx, source/layout/makefile.mk,
source/layout/precompiled_xmlscript.hxx,
source/layout/proplist.cxx, source/layout/proplist.hxx,
source/layout/root.cxx, source/layout/root.hxx,
source/layout/table.cxx, source/layout/table.hxx,
source/layout/timer.cxx, source/layout/timer.hxx,
source/layout/translate.cxx, source/layout/translate.hxx,
source/vclcompat/makefile.mk, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wfield.cxx,
source/vclcompat/wrapper.cxx, source/vclcompat/wrapper.hxx,
workben/layout/editor.cxx, workben/layout/editor.hxx,
workben/layout/makefile.mk, workben/layout/simple-paragraph.cxx,
workben/layout/simple-paragraph.hxx, workben/layout/test.cxx,
workben/layout/uno.hxx, workben/layout/zoom_def.hxx: Add licence
headers.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* workben/layout/meekfile.mk: Junk meekfile.mk
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO: Update TODO.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXScrollBar's getMinimumSize()
from VCLXWindow's switch to method.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx, source/awt/vclxwindow.cxx,
source/awt/vclxwindows.cxx: Move VCLXMessageBox's getMinimumSize()
from VCLXWindow's switch to method.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, inc/toolkit/awt/vclxtopwindow.hxx,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxtopwindow.cxx: Remove code duplication from
VCLXDialog.
2008-02-26 Jan Nieuwenhuizen <janneke@gnu.org>
* source/awt/vclxdialog.cxx, source/vclcompat/wbutton.cxx,
source/vclcompat/wcontainer.cxx, source/vclcompat/wrapper.hxx:
Comment cleanup.
2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/layout/helper.hxx,
workben/layout/editor.cxx, workben/layout/wordcountdialog.cxx: Fix
remaining SUN warnings.
2008-02-21 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/layout/layout.hxx, source/awt/vclxfixedline.hxx,
source/layout/byteseq.cxx, source/layout/helper.hxx,
source/layout/import.cxx, source/layout/makefile.mk,
source/layout/proplist.cxx, source/layout/translate.hxx,
source/vclcompat/wbutton.cxx, source/vclcompat/wcontainer.cxx,
source/vclcompat/wfield.cxx, source/vclcompat/wrapper.cxx,
source/vclcompat/wrapper.hxx, workben/layout/editor.cxx: Fix some
sunstudio12 warnings.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* doc/layout/TODO, source/awt/makefile.mk,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxproxy.cxx, source/awt/vclxproxy.hxx,
source/layout/helper.cxx: Junk VCLXProxy.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* inc/toolkit/awt/vclxwindows.hxx,
inc/toolkit/helper/listenermultiplexer.hxx,
source/awt/vclxbutton.cxx, source/awt/vclxbutton.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/helper.cxx: Hello world on AWTVCLXCancelButton() label
and images.
2008-02-20 Jan Nieuwenhuizen <janneke@gnu.org>
* .gitignore, source/awt/forward.hxx, source/awt/makefile.mk,
source/awt/vclxdialog.cxx, source/awt/vclxdialog.hxx,
source/awt/vclxfixedline.cxx, source/awt/vclxfixedline.hxx,
source/awt/vclxscroller.cxx, source/awt/vclxscroller.hxx,
source/awt/vclxsplitter.cxx, source/awt/vclxsplitter.hxx,
source/awt/vclxtabcontrol.cxx, source/awt/vclxtabcontrol.hxx,
source/layout/makefile.mk, workben/layout/localize-de.sdf,
workben/layout/localize-nl.sdf: Cleanup of includes, namespace in
headers in awt.
2008-07-30 13:02:18 +00:00
|
|
|
for ( RadioButtonsList::iterator it = mxRadios.begin();
|
|
|
|
it != mxRadios.end(); it++ )
|
2008-03-06 10:48:47 +00:00
|
|
|
if ( (*it)->getState() )
|
|
|
|
{
|
|
|
|
mxSelectedRadio = *it;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// lang::XEventListener
|
|
|
|
void SAL_CALL disposing( const css::lang::EventObject& )
|
|
|
|
throw (css::uno::RuntimeException)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// each RadioGroup will stay alive after RadioGroups die with the ImportContext
|
|
|
|
// because they are referenced by every XRadioButton through the listener
|
|
|
|
typedef std::map< rtl::OUString, css::uno::Reference< RadioGroup > > RadioGroupsMap;
|
|
|
|
RadioGroupsMap mxRadioGroups;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
// generator
|
|
|
|
class Widget
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Widget( css::uno::Reference< css::awt::XToolkit > xToolkit,
|
|
|
|
css::uno::Reference< css::awt::XWindow > xToplevel,
|
|
|
|
rtl::OUString unoName, long attrbs );
|
|
|
|
virtual ~Widget();
|
|
|
|
|
|
|
|
virtual void setProperties( const PropList &rProps );
|
|
|
|
|
|
|
|
virtual bool addChild( Widget *pChild );
|
|
|
|
virtual void setChildProperties( Widget *pChild, const PropList &rProps );
|
|
|
|
|
|
|
|
inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
|
|
|
|
{ return mxWidget; }
|
|
|
|
|
|
|
|
inline css::uno::Reference< css::awt::XLayoutConstrains > getContainer()
|
|
|
|
{ return mxContainer; }
|
|
|
|
|
|
|
|
protected:
|
|
|
|
css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
|
|
|
|
css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
|
|
|
|
};
|
|
|
|
|
|
|
|
class Root
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Root( css::uno::Reference< css::awt::XToolkit > xToolkit )
|
|
|
|
: mxToolkit( xToolkit ) {}
|
|
|
|
~Root();
|
|
|
|
|
|
|
|
virtual Widget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs );
|
|
|
|
|
|
|
|
css::uno::Reference< css::awt::XLayoutConstrains > getById( rtl::OUString id );
|
|
|
|
inline css::uno::Reference< css::awt::XLayoutConstrains > getToplevel();
|
|
|
|
|
|
|
|
protected:
|
|
|
|
css::uno::Reference< css::awt::XToolkit > mxToolkit;
|
|
|
|
Widget *mpToplevel;
|
|
|
|
|
|
|
|
typedef std::hash_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >,
|
|
|
|
rtl::OUStringHash > ItemHash;
|
|
|
|
ItemHash maItems;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// parser
|
|
|
|
class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
sal_Int32 XMLNS_LAYOUT_UID, XMLNS_CONTAINER_UID;
|
|
|
|
LayoutRoot &mrRoot; // switch to XNameContainer ref ?
|
|
|
|
#ifdef IMPORT_RADIOGROUP
|
|
|
|
RadioGroups mxRadioGroups;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
inline ImportContext( LayoutRoot &rRoot ) SAL_THROW( () )
|
|
|
|
: mrRoot( rRoot ) {}
|
|
|
|
virtual ~ImportContext() {}
|
|
|
|
|
|
|
|
// XRoot
|
|
|
|
virtual void SAL_CALL startDocument(
|
|
|
|
css::uno::Reference< css::xml::input::XNamespaceMapping >
|
|
|
|
const & xNamespaceMapping )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
|
|
|
|
virtual void SAL_CALL endDocument()
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
virtual void SAL_CALL processingInstruction(
|
|
|
|
::rtl::OUString const & /* rTarget */, ::rtl::OUString const & /* rData */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
virtual void SAL_CALL setDocumentLocator(
|
|
|
|
css::uno::Reference< css::xml::sax::XLocator > const & /* xLocator */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
virtual css::uno::Reference< css::xml::input::XElement >
|
|
|
|
SAL_CALL startRootElement(
|
|
|
|
sal_Int32 nUid, ::rtl::OUString const & rLocalName,
|
|
|
|
css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
|
|
|
|
};
|
|
|
|
|
|
|
|
class ElementBase : public ::cppu::WeakImplHelper1< css::xml::input::XElement >
|
|
|
|
{
|
|
|
|
protected:
|
|
|
|
ImportContext *mpImport;
|
|
|
|
/* TODO: check if all this memebers are needed. */
|
|
|
|
ElementBase *mpParent;
|
|
|
|
sal_Int32 mnUid;
|
|
|
|
|
|
|
|
::rtl::OUString maLocalName;
|
|
|
|
css::uno::Reference< css::xml::input::XAttributes > mxAttributes;
|
|
|
|
public:
|
|
|
|
ElementBase(
|
|
|
|
sal_Int32 nUid, ::rtl::OUString const & rLocalName,
|
|
|
|
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
|
|
|
|
ElementBase * pParent, ImportContext * pImport )
|
|
|
|
SAL_THROW( () );
|
|
|
|
virtual ~ElementBase() SAL_THROW(());
|
|
|
|
|
|
|
|
// XElement
|
|
|
|
virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
|
|
|
|
throw (css::uno::RuntimeException)
|
|
|
|
{ return static_cast< css::xml::input::XElement * >( mpParent ); }
|
|
|
|
virtual ::rtl::OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException)
|
|
|
|
{ return maLocalName; }
|
|
|
|
virtual sal_Int32 SAL_CALL getUid() throw (css::uno::RuntimeException)
|
|
|
|
{ return mnUid; }
|
|
|
|
virtual css::uno::Reference< css::xml::input::XAttributes >
|
|
|
|
SAL_CALL getAttributes() throw (css::uno::RuntimeException)
|
|
|
|
{ return mxAttributes; }
|
|
|
|
|
|
|
|
virtual void SAL_CALL ignorableWhitespace(
|
|
|
|
::rtl::OUString const & /* rWhitespaces */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
virtual void SAL_CALL processingInstruction(
|
|
|
|
::rtl::OUString const & /* Target */, ::rtl::OUString const & /* Data */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
|
|
|
|
virtual css::uno::Reference< css::xml::input::XElement >
|
|
|
|
SAL_CALL startChildElement(
|
|
|
|
sal_Int32 nUid, ::rtl::OUString const & rLocalName,
|
|
|
|
css::uno::Reference<css::xml::input::XAttributes > const & xAttributes )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException) = 0;
|
|
|
|
virtual void SAL_CALL endElement()
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException)
|
|
|
|
{ /* ignore */ }
|
|
|
|
};
|
|
|
|
|
|
|
|
class WidgetElement : public ElementBase
|
|
|
|
{
|
|
|
|
protected:
|
|
|
|
LayoutWidget *mpWidget;
|
|
|
|
|
|
|
|
public:
|
|
|
|
WidgetElement( sal_Int32 nUid, rtl::OUString const &name,
|
|
|
|
css::uno::Reference< css::xml::input::XAttributes > const &attributes,
|
|
|
|
ElementBase *parent, ImportContext *import ) SAL_THROW (());
|
|
|
|
|
|
|
|
~WidgetElement();
|
|
|
|
|
|
|
|
|
|
|
|
virtual css::uno::Reference< css::xml::input::XElement> SAL_CALL
|
|
|
|
startChildElement (sal_Int32 id, rtl::OUString const &name,
|
|
|
|
css::uno::Reference< css::xml::input::XAttributes > const &attributes)
|
|
|
|
throw( css::xml::sax::SAXException, css::uno::RuntimeException );
|
|
|
|
virtual void SAL_CALL characters( ::rtl::OUString const & /* rChars */ )
|
|
|
|
throw (css::xml::sax::SAXException, css::uno::RuntimeException);
|
|
|
|
};
|
|
|
|
|
|
|
|
class ToplevelElement : public WidgetElement
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
ToplevelElement( rtl::OUString const &name,
|
|
|
|
css::uno::Reference< css::xml::input::XAttributes > const &attributes,
|
|
|
|
ImportContext *import ) SAL_THROW (());
|
|
|
|
~ToplevelElement();
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace layoutimpl
|
|
|
|
|
|
|
|
#endif /* IMPORT_HXX */
|