Attachment #81102 for issue #58991

View | Details | Raw Unified | Return to issue 58991
Collapse All | Expand All




#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
// <--
#include <vcl/arrange.hxx>

// sw/inc/expfld.hxx
SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )

    aSelectionToolTipLB.SetSpaceBetweenEntries(1);
    aSelectionToolTipLB.SetHighlightRange();
    // <--
    SetLayout();
}

/*--------------------------------------------------------------------

            aNameED.SetText(sOldSel);
    }
    // <--
    getLayout()->resize();
}

/*--------------------------------------------------------------------

	SetUserData(sData);
}


void SwFldRefPage::SetLayout()
{
    ::boost::shared_ptr< ::vcl::RowOrColumn > xLayout = 
        ::boost::dynamic_pointer_cast< ::vcl::RowOrColumn >( getLayout() );
    ::boost::shared_ptr< ::vcl::RowOrColumn > xTabPart( 
            new ::vcl::RowOrColumn( xLayout.get(), false ) );
    size_t nIndex = xLayout->addChild( xTabPart, 1 );
    xLayout->setBorders( nIndex, -1, -1, -1, 0 );
    xTabPart->setOuterBorder( 1 );
    
    // left part
    Size aListMinSize( aTypeLB.GetSizePixel() );
    ::boost::shared_ptr< ::vcl::RowOrColumn > xLeftPart( 
            new ::vcl::RowOrColumn( xLayout.get(), true ) );
    xTabPart->addChild( xLeftPart, 0 );
    xLeftPart->addWindow( &aTypeFT, 0 );
    xLeftPart->setMinimumSize( xLeftPart->addWindow( &aTypeLB, 8 ), aListMinSize );
    xLeftPart->addWindow( &aFormatFT, 0 );
    xLeftPart->setMinimumSize( xLeftPart->addWindow( &aFormatLB, 8 ), aListMinSize );
    
    Size aEditMinSize( aNameED.GetSizePixel() );
    // right part
    ::boost::shared_ptr< ::vcl::RowOrColumn > xRightPart( 
            new ::vcl::RowOrColumn( xLayout.get(), true ) );
    xTabPart->addChild( xRightPart, 10 );
    
    ::boost::shared_ptr< ::vcl::RowOrColumn > xSelectionPart(
            new ::vcl::RowOrColumn( xRightPart.get(), true ) );
    
    ::boost::shared_ptr< ::vcl::MatrixArranger > xValuePart(
            new ::vcl::MatrixArranger( xRightPart.get(), 4, 2 ) );
    
    xRightPart->addChild( xSelectionPart, 10 );
    xRightPart->addChild( xValuePart, 0 );
    
    xSelectionPart->addWindow( &aSelectionFT, 0 );
    xSelectionPart->setMinimumSize( xSelectionPart->addWindow( &aSelectionLB, 10 ), aListMinSize );
    xSelectionPart->setMinimumSize( xSelectionPart->addWindow( &aSelectionToolTipLB, 10 ), aListMinSize );
    
    xValuePart->setMinimumSize( xValuePart->addWindow( &aNameFT, 0, 0 ), aEditMinSize );
    xValuePart->setMinimumSize( xValuePart->addWindow( &aNameED, 0, 1 ), aEditMinSize );
    xValuePart->setMinimumSize( xValuePart->addWindow( &aValueFT, 1, 0 ), aEditMinSize );
    xValuePart->setMinimumSize( xValuePart->addWindow( &aValueED, 1, 1 ), aEditMinSize );
}


Lines 31-36 Link Here

(-)sw/source/ui/fldui/fldtdlg.src (+1 lines)
31	SVLook = TRUE ;	31	SVLook = TRUE ;
32	Moveable = TRUE ;	32	Moveable = TRUE ;
33	Closeable = TRUE ;	33	Closeable = TRUE ;
		34	Sizeable = TRUE ;
34	TabControl 1	35	TabControl 1
35	{	36	{
36	OutputSize = TRUE ;	37	OutputSize = TRUE ;

Lines 88-93 Link Here

(-)sw/source/ui/fldui/fldref.hxx (+1 lines)
88	const SwTxtNode* GetSavedSelectedTxtNode() const;	88	const SwTxtNode* GetSavedSelectedTxtNode() const;
89	sal_uInt16 GetSavedSelectedPos() const;	89	sal_uInt16 GetSavedSelectedPos() const;
90	// <--	90	// <--
		91	void SetLayout();
91		92
92	protected:	93	protected:
93	virtual sal_uInt16 GetGroup();	94	virtual sal_uInt16 GetGroup();




#include <view.hxx>
#include <fldtdlg.hxx>
#include <swmodule.hxx>
#include <vcl/arrange.hxx>

#include <helpid.h>
#include <fldui.hrc>

		RemoveTabPage(TP_FLD_FUNC);
		RemoveTabPage(TP_FLD_DB);
	}
    SetLayout();
}

/*--------------------------------------------------------------------

}


void SwFldDlg::SetLayout()
{
    Window* pChild = GetWindow( WINDOW_FIRSTCHILD );
    if ( pChild )
    {
        if ( pChild->GetType() == WINDOW_TABCONTROL )
        {
            ::boost::shared_ptr< ::vcl::RowOrColumn > xLayout = 
                ::boost::dynamic_pointer_cast< ::vcl::RowOrColumn >( getLayout() );
            xLayout->setOuterBorder( 0 );
            
            size_t nIndex = xLayout->addWindow( pChild, 3 );
            xLayout->setMinimumSize( nIndex, pChild->GetSizePixel() );
            xLayout->setBorders( nIndex, -1, -1, -1, 0 );
            
            // button part
            ::boost::shared_ptr< ::vcl::RowOrColumn > xButtons( 
                    new ::vcl::RowOrColumn( xLayout.get(), false ) );
            nIndex = xLayout->addChild( xButtons );
            xLayout->setBorders( nIndex, -1, 0, -1, -1 );
            
            xButtons->addChild( new ::vcl::Spacer( xLayout.get(), 2 ) );
            
            Size aMinSize( GetCancelButton().GetSizePixel() );
            xButtons->setMinimumSize( xButtons->addWindow( &GetOKButton() ), aMinSize );
            xButtons->setMinimumSize( xButtons->addWindow( &GetCancelButton() ), aMinSize );
            xButtons->setMinimumSize( xButtons->addWindow( &GetHelpButton() ), aMinSize );
        }
    }
}


Return to issue 58991

Lines 55-60 Link Here

(-)sw/source/ui/fldui/fldref.cxx (+49 lines)
55	#include <IDocumentMarkAccess.hxx>	55	#include <IDocumentMarkAccess.hxx>
56	#include <ndtxt.hxx>	56	#include <ndtxt.hxx>
57	// <--	57	// <--
		58	#include <vcl/arrange.hxx>
58		59
59	// sw/inc/expfld.hxx	60	// sw/inc/expfld.hxx
60	SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )	61	SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* )
Lines 124-129 Link Here
124	aSelectionToolTipLB.SetSpaceBetweenEntries(1);	125	aSelectionToolTipLB.SetSpaceBetweenEntries(1);
125	aSelectionToolTipLB.SetHighlightRange();	126	aSelectionToolTipLB.SetHighlightRange();
126	// <--	127	// <--
		128	SetLayout();
127	}	129	}
128		130
129	/*--------------------------------------------------------------------	131	/*--------------------------------------------------------------------
Lines 720-725 Link Here
720	aNameED.SetText(sOldSel);	722	aNameED.SetText(sOldSel);
721	}	723	}
722	// <--	724	// <--
		725	getLayout()->resize();
723	}	726	}
724		727
725	/*--------------------------------------------------------------------	728	/*--------------------------------------------------------------------
Lines 1067-1069 Link Here
1067	SetUserData(sData);	1070	SetUserData(sData);
1068	}	1071	}
1069		1072
		1073
		1074	void SwFldRefPage::SetLayout()
		1075	{
		1076	::boost::shared_ptr< ::vcl::RowOrColumn > xLayout =
		1077	::boost::dynamic_pointer_cast< ::vcl::RowOrColumn >( getLayout() );
		1078	::boost::shared_ptr< ::vcl::RowOrColumn > xTabPart(
		1079	new ::vcl::RowOrColumn( xLayout.get(), false ) );
		1080	size_t nIndex = xLayout->addChild( xTabPart, 1 );
		1081	xLayout->setBorders( nIndex, -1, -1, -1, 0 );
		1082	xTabPart->setOuterBorder( 1 );
		1083
		1084	// left part
		1085	Size aListMinSize( aTypeLB.GetSizePixel() );
		1086	::boost::shared_ptr< ::vcl::RowOrColumn > xLeftPart(
		1087	new ::vcl::RowOrColumn( xLayout.get(), true ) );
		1088	xTabPart->addChild( xLeftPart, 0 );
		1089	xLeftPart->addWindow( &aTypeFT, 0 );
		1090	xLeftPart->setMinimumSize( xLeftPart->addWindow( &aTypeLB, 8 ), aListMinSize );
		1091	xLeftPart->addWindow( &aFormatFT, 0 );
		1092	xLeftPart->setMinimumSize( xLeftPart->addWindow( &aFormatLB, 8 ), aListMinSize );
		1093
		1094	Size aEditMinSize( aNameED.GetSizePixel() );
		1095	// right part
		1096	::boost::shared_ptr< ::vcl::RowOrColumn > xRightPart(
		1097	new ::vcl::RowOrColumn( xLayout.get(), true ) );
		1098	xTabPart->addChild( xRightPart, 10 );
		1099
		1100	::boost::shared_ptr< ::vcl::RowOrColumn > xSelectionPart(
		1101	new ::vcl::RowOrColumn( xRightPart.get(), true ) );
		1102
		1103	::boost::shared_ptr< ::vcl::MatrixArranger > xValuePart(
		1104	new ::vcl::MatrixArranger( xRightPart.get(), 4, 2 ) );
		1105
		1106	xRightPart->addChild( xSelectionPart, 10 );
		1107	xRightPart->addChild( xValuePart, 0 );
		1108
		1109	xSelectionPart->addWindow( &aSelectionFT, 0 );
		1110	xSelectionPart->setMinimumSize( xSelectionPart->addWindow( &aSelectionLB, 10 ), aListMinSize );
		1111	xSelectionPart->setMinimumSize( xSelectionPart->addWindow( &aSelectionToolTipLB, 10 ), aListMinSize );
		1112
		1113	xValuePart->setMinimumSize( xValuePart->addWindow( &aNameFT, 0, 0 ), aEditMinSize );
		1114	xValuePart->setMinimumSize( xValuePart->addWindow( &aNameED, 0, 1 ), aEditMinSize );
		1115	xValuePart->setMinimumSize( xValuePart->addWindow( &aValueFT, 1, 0 ), aEditMinSize );
		1116	xValuePart->setMinimumSize( xValuePart->addWindow( &aValueED, 1, 1 ), aEditMinSize );
		1117	}
		1118

Lines 53-58 Link Here

(-)sw/source/ui/fldui/fldtdlg.cxx (+33 lines)
53	#include <view.hxx>	53	#include <view.hxx>
54	#include <fldtdlg.hxx>	54	#include <fldtdlg.hxx>
55	#include <swmodule.hxx>	55	#include <swmodule.hxx>
		56	#include <vcl/arrange.hxx>
56		57
57	#include <helpid.h>	58	#include <helpid.h>
58	#include <fldui.hrc>	59	#include <fldui.hrc>
Lines 124-129 Link Here
124	RemoveTabPage(TP_FLD_FUNC);	125	RemoveTabPage(TP_FLD_FUNC);
125	RemoveTabPage(TP_FLD_DB);	126	RemoveTabPage(TP_FLD_DB);
126	}	127	}
		128	SetLayout();
127	}	129	}
128		130
129	/*--------------------------------------------------------------------	131	/*--------------------------------------------------------------------
Lines 380-382 Link Here
380	}	382	}
381		383
382		384
		385	void SwFldDlg::SetLayout()
		386	{
		387	Window* pChild = GetWindow( WINDOW_FIRSTCHILD );
		388	if ( pChild )
		389	{
		390	if ( pChild->GetType() == WINDOW_TABCONTROL )
		391	{
		392	::boost::shared_ptr< ::vcl::RowOrColumn > xLayout =
		393	::boost::dynamic_pointer_cast< ::vcl::RowOrColumn >( getLayout() );
		394	xLayout->setOuterBorder( 0 );
		395
		396	size_t nIndex = xLayout->addWindow( pChild, 3 );
		397	xLayout->setMinimumSize( nIndex, pChild->GetSizePixel() );
		398	xLayout->setBorders( nIndex, -1, -1, -1, 0 );
		399
		400	// button part
		401	::boost::shared_ptr< ::vcl::RowOrColumn > xButtons(
		402	new ::vcl::RowOrColumn( xLayout.get(), false ) );
		403	nIndex = xLayout->addChild( xButtons );
		404	xLayout->setBorders( nIndex, -1, 0, -1, -1 );
		405
		406	xButtons->addChild( new ::vcl::Spacer( xLayout.get(), 2 ) );
		407
		408	Size aMinSize( GetCancelButton().GetSizePixel() );
		409	xButtons->setMinimumSize( xButtons->addWindow( &GetOKButton() ), aMinSize );
		410	xButtons->setMinimumSize( xButtons->addWindow( &GetCancelButton() ), aMinSize );
		411	xButtons->setMinimumSize( xButtons->addWindow( &GetHelpButton() ), aMinSize );
		412	}
		413	}
		414	}
		415